summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-07enable auto-recording featureauto-recordsEvgeny Zinoviev
Change-Id: Ie625437f422daaffb7b751776ad76039b0ac6041
2021-11-01Automatic translation importMichael W
Change-Id: I9bb0ecefdf8b580f7e205faff4d034f4e961d5d0
2021-10-18Fix selecting phone account dialog show error.Grace Jia
AOSP dialer used to ignore UserHandle of a PhoneAccountHandle when building the selection list. When secondary user or guest mode is in use, dialer composed a wrong PhoneAccountHandle with current UserHandle so Telecom cannot provide correct information of this PhoneAccountHandle. Bug: 157499347 Test: Manually switch to guest mode or secondary user to check if the dialog show correctly. Change-Id: I8a9f9bcf5192f69ca270def48fb850106aa717fb
2021-10-18Dialer: Notify content observers upon call log entry deletionLuK1337
* This change makes call log refresh its data after deleting an entry. Change-Id: Iaa8a559cd02853be05b69cd2daca1e321679369e
2021-09-23Dialer: Fix typo in RU translationcyberwalkman
* In the application menu and on the desktop, the application shortcut is called "Позвонить"("Call") instead of "Телефон"("Phone"). Change-Id: Ie0c3ab526288dd756c948251f2d403c48fb13c09
2021-09-21Fix status bar colors in detail activities.Danny Baumann
Change-Id: I0994bd1fd9922f18a08364a0d88426d88cb04b6a
2021-08-21Automatic translation importMichael Bestas
Change-Id: Ie3a73c54c766044acbcc8608dd54cc502518799e
2021-07-12Dialer: improve search barTimi Rautamäki
* Make background color lighter * Update border radius * Update ripple to follow border radius * Remove the background color, use same as activity * Update the back-icon color to white/black for consistency Change-Id: I648a2bd0da47fec99d8a8457c70451e77ed9f8be
2021-07-12Dialer: set statusbar color same as activity backgroundTimi Rautamäki
* Keep styles that use actionBar as is because it uses normal actionbar * Set light statusbar attribute for some styles Change-Id: I8748aa4d12f8e0c68d14d514ea5a2bd4100ee3ca
2021-07-12Dialer: update ripple colorTimi Rautamäki
Ripple on dark should be lighter than background. Change-Id: I01993eac93f29609353ef1e1e9b5dc9a211a640c
2021-07-12Dialer: update dark theme colorsTimi Rautamäki
The dark theme colors exist in java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml that would be used with AOSPThemeModule. As the app uses framework dark theme instead of the module, copy the dark theme colors to values-night. Change-Id: I02a36b01ba581e62556ce6e0151ff0a35209467a
2021-07-12Dialer: correct the expanded search bar heightTimi Rautamäki
This causes the expand animation to be choppy first time Test: make Dialer, verify the animation no longer shifts the view first time the animation is played. Change-Id: Ia72b38ab39f19c2518385d6a858dc2fd194bbb55
2021-05-28Dialer: Helplines: Fix a few casing issuesMichael W
Change-Id: I31c2423aee5310ae08c9295971fbe7aced1f8f9b
2021-05-28Dialer: Helplines: Use a webview dialogLuca Stefani
* Instead of relying on one browser we can actually display a webview ourselves * Set various headers to clear cache and to not track * Displays a progressbar and loading text while the page loads Co-authored-by: Michael W <baddaemon87@gmail.com> Change-Id: Ibad2832c0cb6bcef79b5f348c40ca76c2516b295
2021-05-22Dialer: Remove unused resourcesMichael Bestas
These have been removed in previous commits Change-Id: Ib8a32eae0acef2eec6250db64ff1e96c521c17d3
2021-05-22Dialer: Helplines: Add Bullying and Immigration categoriesMichael W
Change-Id: I7969fd0dd610a4f041f55ce04e6ede5c66005dee
2021-05-22Dialer: use black/white navigation colorsTimi
Change-Id: I9d2ee0bbc7d765e605d6f60c7866565c83dff295
2021-05-01Automatic translation importLineageOS Builder
Change-Id: I3399206bf8828f113392776bd81eec0b354897dc
2021-03-14Dialer: Helplines: Launch incognito tabMichael W
* Instead of warning every time a link is clicked, at least for jelly launch an incognito tab directly Change-Id: Iff278792d115edaa69fea91d708468e3598eca5d
2021-03-14Dialer: Move to SPN schema classesLuca Stefani
Change-Id: I2cd3706f64bf45a2a6dd53caa9d5da48cf93ea28
2021-03-14Dialer: Add a helpline phone bookMichael W
* Expose the sensitive numbers to the user so they can easily call one of them * Make sure to leave as few traces of access as possible: * Calling a number closes the helpline activity * Opening a link closes the helpline activity * Before opening a link, a warning about browser history appears * This makes use of a changed xml-format, which now allows adding various things: <item> <categories>violence|human trafficking</categories> <name>Some NGO or whatever</name> <number>1234</number> <anything>anything else</anything> </item> Change-Id: I952bf10ee9516b83e595d8a19450696b303393b6
2021-03-14Dialer: Hide sensitive numbers from incall screenMichael W
* In order to have less places where a sensitive number could be shown during usage, hide them from incall ui as well Change-Id: I686f9a8fc09d62884344a2ddc949f12d0d5e1f7c
2021-03-14Dialer: Don't prompt to send a message to sensitive numbersMichael W
* When calling a number but hanging up, you get a prompt "Send a message" * For a sensitive number that doesn't make sense for two reasons a) The message possible wouldn't get received there (most likely) b) The message would then show up in the messaging app - which is not really desired either Change-Id: Ic6450d5a44ba97a4da085adb1da0275477bb14fc
2021-03-14Dialer: Move assertion to top of methodMichael W
* Instead of using the number unchecked in various places and fail later when the value is null, move the assertion to the top of the method so we don't have to do all the work in between when we fail it anyway * Also change the occurances of getPhoneNumber() so we don't have to call into that various times instead of once Change-Id: Ibf7ab971dc1ee65e3d8bcc7668e9f9c8c3a30651
2021-03-08dialer: Allow Call Recording For BangladeshNahid Hasan Riyad
Change-Id: I40a400fb6af3be7a986b1ec32f1fac716e7ead92
2021-02-28Automatic translation importMichael Bestas
Change-Id: I74c642b3b9aad5034895cc0cc72a8f3c986797db
2020-12-12Dialer: handle database downgrade from lineage-16.0Michael Bestas
Change-Id: I67a84d8f709d97d66c76cbac30f5bc997ef69c54
2020-12-12Fix theme for PostCallActivitySungjae
NoActionBar theme is more proper for PostCallActivity since no need any title and a send button can have a vivid color when enabled. Test: am start -n com.android.dialer/.postcall.PostCallActivity -e "phone_number" "12345678" Signed-off-by: Sungjae <sung_jae.kim@samsung.com> Change-Id: I1971f5b2db2674f298f3f442f0113309d5523a7c
2020-12-12Fix translation of 'contacts' tab title and main menu.Danny Baumann
AOSP migrated those items to new strings, but those strings don't have any translations. Just use the previous string instances instead, which still exist and have valid translations. Change-Id: I55d7e5a5bf630e5813d2a2c22888b906b704e3f5
2020-12-12 Failed to show hold call when user click swap and merge simultaneouslyrongmei.li
Set EVENT_MERGE_START for foregroundConnection and backgroundConnection but don't set EVENT_MERGE_COMPLETE when there is ImsException Bug: 121105030 Change-Id: Ib376b24e5d307d8907d7ec2c8a3e025c04682d88
2020-12-12Dialer: Use a DayNight launch themeScott Warner
This prevents the white launch screen from appearing when the system theme is dark Change-Id: I1ee8ff493910578b5e5c9de67ea1f7390178051a
2020-12-12Dialer: allow framework to do dark theming automaticallyJesse Chan
Change-Id: I5b840ba257adda69882e1fe19a55510802c45106 Signed-off-by: Jesse Chan <jc@lineageos.org>
2020-12-12Updated target SDK from 28 to 29.Raman Tenneti
Merged the following change from internal source: cl/305938566 Do not use EXTRA_IS_HANDOVER for API levels 28 and above When targeting API level 29, this field becomes blacklisted. Since the Handover feature is officially supported via a public API since API level 28, we do not need to check for the internal field when the API level is 28+. go/forrest_run/L11100000565062425 BUG: 143990966 Test: manual and CTS tests. Change-Id: Ib3fda29b4d5714efc52b29f49ca4a9a310584fff
2020-12-12Dialer: AudioModeProvider: use wired route for usb headsetscodeworkx
Change-Id: I920a9c259af5597dfd9a88a72e4ac54cb6e73f7a
2020-12-12Control dialer's incoming call proximity sensor check via an overlayblunden
This feature can't be used on devices with proximity sensors that don't work when the screen is off, e.g. sensors using ultrasound technology. The result in those cases is a black screen with just the status bar showing, instead of the normal incoming call UI. Make it possible to opt-out via an overlay. Change-Id: Ic3848d09e1ed80e5409cbecbaca2517db16ed0b8
2020-12-12Re-add dialer lookup.Xiao-Long Chen
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to> Date: Mon Sep 12 09:34:02 2016 +0200 Re-add dialer lookup. BUGBASH-612: do not send phone numbers to non-ssl sites for reverse/forward/people lookups Change-Id: I677460ad5767b8698ee24d6d43ff159aee55387a Author: Joey <joey@lineageos.org> Date: Wed Mar 28 21:11:16 2018 +0200 Dialer: comply with EU's GDPR Disable lookup by default and add a disclaimer for the feature Change-Id: If7a181952304dbaee736762bdfd5819eddc5f89b Signed-off-by: Joey <joey@lineageos.org> Change-Id: I4ff90a678618fa8c7b5970dff3dd246b0c87135c
2020-12-12Re-add call statistics.Danny Baumann
Author: Danny Baumann <dannybaumann@web.de> Date: Mon Nov 11 15:36:21 2019 +0100 Fix crash in call stats. We fed color resources into LinearColorBar now. Change-Id: Ica6870fb6af8b982bc2710e7b63092c513fa4755 Author: Danny Baumann <dannybaumann@web.de> Date: Mon Dec 2 09:34:22 2019 +0100 Beautify call stats details category headers. Make them consistent with how pref category headers are displayed. Change-Id: I4ee8bb2dae11970051552d14df2d58d7ab6a3fdf Change-Id: I9f2b6e912ca69a5aa7a1790bed06304ee953e752
2020-12-12Allow per-call account selection.Danny Baumann
Change-Id: Ieac27294f4069b2cff17bb39a0954f74320ad943
2020-12-12Re-add call recording.Danny Baumann
Author: Danny Baumann <dannybaumann@web.de> Date: Mon Jul 9 11:19:24 2018 +0200 Re-add call recording. Change-Id: I53fadf5754b5b6cc3e9920d57480e470e2305ac0 Author: Markus Gruber <gruberma@outlook.at> Date: Sat Oct 13 09:17:01 2018 +0200 Allow call recording for Austria * Call recording is legal in Austria, so it should be available in the UI Change-Id: Iaae0b222d2a1108572832732471e7e063f84dd1f Author: Alexandre Pary <alexandre.pary@gmail.com> Date: Wed Oct 17 11:33:35 2018 +0200 Allow call recording for Belgium * Call recording is legal in Belgium, so it should be available in the UI Change-Id: I0d18c5c31aa5fbde08a849932ac0c8088508dbd8 Author: Arekusu Rin <alexmatteotv@gmail.com> Date: Thu Oct 18 10:20:42 2018 +0200 Allow call recording for Bulgaria. * Call recording is legal, subject to certain restrictions, in Bulgaria. Call recording without notification or one side's consent is not a criminal offense, and only affects the admissibility of said call recording as evidence. Change-Id: Ie35f23056914fb2e7639ea509675e21e7fdfab26 (cherry picked from commit 4cec325c31dbe5894ab576b6161065ad0458612d) Author: Bruno Martins <bgcngm@gmail.com> Date: Tue Oct 23 21:03:47 2018 +0100 res: Fix malformed XML * The legal precedent source URL includes double dashes and breaks aapt2 compilation. Replace it by a shortened one. Change-Id: Ic1cb1b6af16d27649e36478ca7597b78b93b1338 Author: Arekusu Rin <alexmatteotv@gmail.com> Date: Thu Oct 25 12:50:57 2018 +0200 Enable or disable call recording for numerous countries via MCC. * This change handles call recording within the Dialer. Changes were made to the template of all of the XML files, and all links were changed to https, where possible. Quotes of the precedents and/or laws can be found within each country's XML file. Countries' whose status was not changed are not explicitly mentioned below, despite any changes to their files. * Call recording is disabled for: Andorra, Iceland, Indonesia, Monaco, Switzerland, the United States of America and some of its territories - Guam, Northern Mariana Islands, Puerto Rico and the United States Virgin Islands. * Call recording is enabled for: Albania, American Samoa, Argentina, Armenia, Aruba, Belarus, Bonaire, Bosnia and Herzegovina, Brazil, Canada, Chile, Croatia, Curaçao, Cyprus, Estonia, Faroe Islands, French Guiana, French Polynesia, Georgia, Greece, Greenland, Guadeloupe, Hungary, India, Ireland, Israel, Japan, Kosovo, Latvia, Liechtenstein, Lithuania, Luxembourg, Malta, Martinique, Mayotte, Moldova, Montenegro, Morocco, New Caledonia, New Zealand, North Macedonia, Peru, Russia, Réunion, Saba, Saint Barthélemy, Saint-Martin, Saint-Pierre-et-Miquelon, Serbia, Singapore, Sint Eustatius, Sint Maarten, Slovakia, Slovenia, South Africa, South Korea, Turkey, Ukraine and Wallis-et-Futuna. Change-Id: Iba5b7028d26cac281099f81bf3d5c21e2ee4d1a9 Author: Arekusu Rin <alexmatteotv@gmail.com> Date: Wed Jun 12 09:58:05 2019 +0200 Enable Call Recording for Sri Lanka and Costa Rica. * Call recording is enabled for: Sri Lanka (413) and Costa Rica (712). * Fixes: Removed newline from Belgium (206) and space from Russia (250). Change-Id: I4c9ecf41e9fd472b97fff5cd03800414737be87a Author: Danny Baumann <dannybaumann@web.de> Date: Thu Nov 7 08:34:44 2019 +0100 Base 'call recording allowed' decision on current country. Selection of resources by MCC happens via the SIM MCC, but what matters for legislation is the current country, not the country the SIM origins from. Because of that, move the decision about whether call recording is allowed or not to the current country instead of SIM MCC. Change-Id: I0ee365d7af8e3392716318e5a51e12e0efe7029a Author: Han Wang <416810799@qq.com> Date: Wed Nov 20 13:27:00 2019 +0200 Enable call recording for China Change-Id: Id51a2e6a119e99ff50696b50513aed323c61565c Author: mhkjahromi <m.h.k.jahromi@gmail.com> Date: Sat Dec 7 18:32:20 2019 +0330 Enable call recording for Iran Change-Id: I5640405d9bd38ac3d83fd618543190c1b0d800fb Author: Danny Baumann <dannybaumann@web.de> Date: Thu Feb 20 13:19:27 2020 +0100 Refactor call recording to use MediaProvider. Change-Id: Id53d43d8bf10715a1597ff754f6c38a992302190 Author: Danny Baumann <dannybaumann@web.de> Date: Fri Jun 5 13:19:46 2020 +0200 Iterate old recordings properly when migrating call recording data. SparseArray.get() expects a key, not an index. Change-Id: I0ba40180dc9df9f8a8f4036ccbe47cc59a50cfbb Change-Id: Ie9e0af8ccadb1bab1c52a5d905344d0c8fcab92c
2020-12-12Add setting to enable Do Not Disturb during callsblunden
Android N and earlier enabled Do Not Disturb mode while in a call. Reimplement this behavior to prevent incoming notifications from vibrating or playing sounds. Change-Id: Ic38ac775c6e353898190e1571b6d6e521c0e5aa1
2020-12-12Generalize the in-call vibration settings categoryblunden
Rename it to "In-call" and adjust the preference hiding code accordingly. Turn checkboxes into switches for more consistency. Change-Id: If22a58b4f82e3db59373e53da0632c126bd946f4
2020-12-12Add back in-call vibration featuresDanny Baumann
Change-Id: Ia30a3c46e9c37d7d73288ec605af8efc3a46a323
2020-12-12Revert "Remove dialer sounds and vibrations settings fragments and redirect ↵Danny Baumann
to the system sound settings fragment instead." We add additional settings to this fragment, so the stated reasons for removing it don't apply to us. This reverts commit c378fb17f0ae994b950273e0f91b5692ad7638cf. Change-Id: I0a8bd3135c43627d4355cc5c01c1144a03518144
2020-12-12Dialer: disable anti-falsing for call answer screenAdrian DC
* The anti-falsing implementation from HumanInteractionClassifier regularly prevents easy swipe to answer, requiring multiple attempts until accepted. Change-Id: Iebad27f9da7bb8fea6fc663dc99ac6c17d94ed5f (cherry picked from commit 583e42df0f6f02f1a6c05dbdc5559f42e99c8727)
2020-12-12Dialer: adaptive iconAsher Simonds
Change-Id: Ice040bb2785e8e4e3828c6008121520586d269ac Signed-off-by: Joey <joey@lineageos.org>
2020-12-12Dialer: define app categoryJoey
Change-Id: I53b6ee1c70925c50e91270e0b084d777dd8c06f6 Signed-off-by: Joey <joey@lineageos.org>
2020-12-12Dialer: Fix proto warning with optmize for liteLuca Stefani
* option optimize_for = LITE_RUNTIME is ignored in proto 3+ * Instead we should use the java_lite compiler via the LOCAL_PROTOC_OPTIMIZE_TYPE flag which defaults to lite in java projects Test: m Dialer, no warnings Change-Id: I552f5895bbe8192a4ae870bb48e5ef6a9e7e8c78
2020-02-10Merge "Reland: Rework platform version to hide codenames."Narayan Kamath
2020-02-07Merge "Fix FATAL Exception in PostCallActivity" am: 4b2da35108 am: ↵Automerger Merge Worker
35c12ca943 am: 8d3f2dc70e Change-Id: I73dac7ae2ee37068fd342aefb2426f8b85f56ab1
2020-02-07Merge "Fix FATAL Exception in PostCallActivity" am: 4b2da35108 am: 35c12ca943Automerger Merge Worker
Change-Id: I10f10944989f058fdc441d85314f33244522aeed
2020-02-07Merge "Fix FATAL Exception in PostCallActivity" am: 4b2da35108Automerger Merge Worker
Change-Id: I48476d4c4be6780ee316a65a048172d557e4b151
2020-02-07Merge "Fix FATAL Exception in PostCallActivity"Treehugger Robot
2020-02-06Reland: Rework platform version to hide codenames.Dianne Hackborn
The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Test: manual Change-Id: Ic0621234215d4ba79255b985dccdd4ae6c863fc8 Exempt-From-Owner-Approval: Previously approved, no new changes.
2020-01-16[automerger skipped] DO NOT MERGE - Merge ↵Automerger Merge Worker
qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: f6b13b7304 am: 9de53ff92f -s ours am skip reason: subject contains skip directive Change-Id: Ic48dd840bf18c5acdc57416ea0b938b0e450c426
2020-01-16DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Automerger Merge Worker
stage-aosp-master am: f6b13b7304 Change-Id: Id6a32cf300b7a132ab712c986c4725bfe5e6026d
2020-01-15DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Xin Li
stage-aosp-master Bug: 146167222 Change-Id: I44c4fcf7b96d13ecdbcce4f79517f18a38c9726c
2019-12-20[automerger skipped] Require unlock for custom SMS dialog am: 41606094d4 am: ↵Automerger Merge Worker
5fce345b14 -s ours am skip reason: Change-Id Ib6822436bcebc799e7e920f1a5898d107dd619db with SHA-1 fab2f0fddb is in history Change-Id: Ifd50a5adbcc855db3938f39aebee4e34efa7ccc4
2019-12-20Require unlock for custom SMS dialog am: 41606094d4Automerger Merge Worker
Change-Id: I4b18b497583bc5d3c455e1088fd56fa5c509c23b
2019-12-19Require unlock for custom SMS dialogBryan Ferris
Currently when a call is recieved there is an option to write a custom text message in response to the call. This could allow an attacker to imporsonate the user. With this change devices that have a lock screen set will require that the pattern/pin/password be entered before a custom message can be written. This is a cherry-pick from the Pixel dialer. The original commit can be found at cl/257702865 Bug: b/137102479 Test: Call phone running the modified dialer and attempt to send a custom message Change-Id: Ib6822436bcebc799e7e920f1a5898d107dd619db Merged-In: Ib6822436bcebc799e7e920f1a5898d107dd619db
2019-11-14Revert submissionKevin Lau Fang
Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336). Change-Id: Ib9fb23e378034fe73373030e0865c6bac99d4f37
2019-11-11Rework platform version to hide codenames.Dianne Hackborn
The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Test: manual Change-Id: Ic8fe4defb609dee24f53358dc7b37e3590482b27
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 80a6f0558b am: f2dd2154aa -s ours am skip reason: subject contains skip directive Change-Id: I8ef5867da89e6c2a81071a8c5492a20a2e56504a
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 80a6f0558b Change-Id: Ibf2f68e3b99ed7b5c48a3185991ece7a07f02a6b
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I881e2a3f4fbabb8bb5ca3959a22748508ce23f58
2019-10-02Fix FATAL Exception in PostCallActivityTaesu Lee
Use Theme.AppCompat.Light to fix IllegalStateException for PostCallActivity extending AppCompatActivity. Test: am start -n com.android.dialer/.postcall.PostCallActivity Change-Id: Ica815d43cd8dae73fbc8ec948dd701a1455d1704 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-09-18Merge "Require unlock for custom SMS dialog"Bryan Ferris
2019-09-11Require unlock for custom SMS dialogBryan Ferris
Currently when a call is recieved there is an option to write a custom text message in response to the call. This could allow an attacker to imporsonate the user. With this change devices that have a lock screen set will require that the pattern/pin/password be entered before a custom message can be written. This is a cherry-pick from the Pixel dialer. The original commit can be found at cl/257702865 Bug: b/137102479 Test: Call phone running the modified dialer and attempt to send a custom message Change-Id: Ib6822436bcebc799e7e920f1a5898d107dd619db
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c25d314f21 -s ours am: 519cf9138d -s ours am: 5d734dc3e5 -s ours am skip reason: change_id Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772 with SHA1 b6ad196f34 is in history Change-Id: I935da6ca26163b2bbc6db32aaa8e4903a9f945fa
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c25d314f21 -s ours am: 519cf9138d -s ours am skip reason: change_id Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772 with SHA1 b6ad196f34 is in history Change-Id: I963922b5192333f6ea0599177cebf5f0e768f479
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c25d314f21 -s ours am skip reason: change_id Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772 with SHA1 b6ad196f34 is in history Change-Id: I143c0b1dd28ba679bd9917b22a18cd8bef3e34a2
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I4ce8eb798889a62fb84d337d52b47526e7a6ba49 Merged-In: Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
42aa89c0b1 -s ours am: c118fcc13a am: 4740356d31 am: 180bdfd37d -s ours am skip reason: subject contains skip directive Change-Id: Iff4721847dffa6ab9079399188395859e433c655
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
42aa89c0b1 -s ours am: c118fcc13a am: 4740356d31 Change-Id: Iae122a09191bbdb0004197bc26e57efdb5418d67
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
42aa89c0b1 -s ours am: c118fcc13a Change-Id: I931790f36b6d0ab56072c60b072b3218d77635c0
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 42aa89c0b1 -s ours am skip reason: subject contains skip directive Change-Id: I9e44e02c6a19c089e0ed9f2932198ac6530115e3
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772
2019-07-12Merge "Remove --legacy flag" am: d3af7434a5 am: c57dd6e8be am: e9382b76b0Greg Kaiser
am: 340e0d8847 Change-Id: I33f9c04e9acb96d68c80604ab946e12fe8fd4746
2019-07-12Merge "Remove --legacy flag" am: d3af7434a5 am: c57dd6e8beGreg Kaiser
am: e9382b76b0 Change-Id: I43580a36f1fb52d9a96e6fc322dbe19221ad52b3
2019-07-12Merge "Remove --legacy flag" am: d3af7434a5Greg Kaiser
am: c57dd6e8be Change-Id: Ifffc2ffc8562e55680bc43a46f1bf512dc16b12e
2019-07-12Merge "Remove --legacy flag"Greg Kaiser
am: d3af7434a5 Change-Id: I79b2e735932374cc4978754a7615486e1a8c5a00
2019-07-12Merge "Remove --legacy flag"Treehugger Robot
2019-07-11Merge "AOSP/Dialer - Fix improperly formatted resource string in Dialer ↵Raman Tenneti
across many languages." am: 8910fde7dd am: 8f9e253e97 am: d0f720b917 am: 67f0311a14 Change-Id: Ie6a29fc3595b3a417c823b03d6bf20597264c8fd
2019-07-11Merge "AOSP/Dialer - Fix improperly formatted resource string in Dialer ↵Raman Tenneti
across many languages." am: 8910fde7dd am: 8f9e253e97 am: d0f720b917 Change-Id: I6045e2a0793df21c5b3e5f0342393810da844c92
2019-07-11Merge "AOSP/Dialer - Fix improperly formatted resource string in Dialer ↵Raman Tenneti
across many languages." am: 8910fde7dd am: 8f9e253e97 Change-Id: I5c1b8b1d0e1060cc6393b119cd4addb1ba3de0cc
2019-07-11Merge "AOSP/Dialer - Fix improperly formatted resource string in Dialer ↵Raman Tenneti
across many languages." am: 8910fde7dd Change-Id: Icb3e2fa4d4188d48c48e796db1d13e553c2f9a65
2019-07-11Remove --legacy flagGreg Kaiser
We've fixed the improperly formated resource strings, so no longer need this flag. Bug: 135615364 Test: TreeHugger Change-Id: I0d546f73311f066dabeaf599f358a35fb130f71b
2019-07-11Merge "AOSP/Dialer - Fix improperly formatted resource string in Dialer ↵Treehugger Robot
across many languages."
2019-07-08AOSP/Dialer - Fix improperly formatted resource string in Dialer across many ↵Raman Tenneti
languages. Bug: 135615364 Test: manual - Did a "make -j40" and verified that there are no warnings in strings.xml. Change-Id: I5b835af079832c8f38bd582113559b830efedaef
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 10074ae13c am: 983e4e2861 -s ours am skip reason: subject contains skip directive Change-Id: I3267e64a00892e251b8dc4a181792ab056b54128
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 10074ae13c Change-Id: I54562890277077d952df4ef24f0372bc00c43e5a
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Ieed3a8162dfa04d26cb39eeb7e46c1c9e65e40e0
2019-06-27Merge "Pass --legacy to aapt2 compile for Dialer" am: 058ddde95e am: ↵Colin Cross
37030b0a5c am: 43b2886312 am: eb291a8fe6 Change-Id: I427c5376d22b6de281b670398016c421551734d2
2019-06-26Merge "Pass --legacy to aapt2 compile for Dialer" am: 058ddde95e am: 37030b0a5cColin Cross
am: 43b2886312 Change-Id: Icaa306eda1f7f47ba7ce32e9d83842bea266c30d
2019-06-26Merge "Pass --legacy to aapt2 compile for Dialer" am: 058ddde95eColin Cross
am: 37030b0a5c Change-Id: If6ca22cb45462bb934e2195e3a213359d9c09e99
2019-06-26Merge "Pass --legacy to aapt2 compile for Dialer"Colin Cross
am: 058ddde95e Change-Id: Id38ac73d9292150fce115186c8a4316e7a8c9d67
2019-06-26Merge "Pass --legacy to aapt2 compile for Dialer"Colin Cross
2019-06-20Pass --legacy to aapt2 compile for DialerColin Cross
This module produces warnings that are treated as errors if --legacy is not passed. --legacy is no longer being passed by default, so add it here. Bug: 135615364 Test: m java Change-Id: I4db9606206597a58b2a6864ac5ef6d944bb292b4
2019-06-10Merge "Remove improper LOCAL_AIDL_INCLUDES" am: cca2453024 am: c87917f39b ↵Dan Willemsen
am: 3a2e2153b7 am: af62f8f6a3 Change-Id: Idd638bb1763d6914dc4d21b94d5d8e829b38fafe
2019-06-10Merge "Remove improper LOCAL_AIDL_INCLUDES" am: cca2453024 am: c87917f39bDan Willemsen
am: 3a2e2153b7 Change-Id: I8d14a5174f84c8fc2700e6bd9d69e0b57405d3bf
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 08:37:50 +0000