OSDN Git Service
Raff Tsai [Wed, 5 Jun 2019 09:34:55 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours
am:
f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I3703a33f61f1d3ee56d6223f680548e06d8ba997
Raff Tsai [Wed, 5 Jun 2019 09:34:38 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours
am:
ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Iad7b242d3b85102d68ace5426ff9dd25cad04454
Raff Tsai [Wed, 5 Jun 2019 09:28:55 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours
am:
2d387349db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I27f9a530b3814c723726e43e8902651da3bfa937
Raff Tsai [Wed, 5 Jun 2019 09:28:42 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours
am:
971190b08a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ic3814c5b17fe748c35e11034d75549104e7de429
Raff Tsai [Wed, 5 Jun 2019 09:22:46 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours
am:
20b5a01f6c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b
Raff Tsai [Wed, 5 Jun 2019 09:22:36 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours
am:
d20d75c39b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: If4596f7e943656ccb7bc06121fe77c5d6d76d627
Raff Tsai [Wed, 5 Jun 2019 09:17:44 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours
am:
530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
Raff Tsai [Wed, 5 Jun 2019 09:17:35 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours
am:
59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
Raff Tsai [Wed, 5 Jun 2019 09:11:52 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
am:
bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
Raff Tsai [Wed, 5 Jun 2019 09:11:36 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
am:
6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
Android Build Merger (Role) [Wed, 5 Jun 2019 02:48:34 +0000 (02:48 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:14 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:12 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631
Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:11 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d
Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:09 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:07 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
Bill Yi [Wed, 5 Jun 2019 01:25:55 +0000 (18:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
3d9c7cb356 -s ours
am skip reason: subject contains skip directive
Change-Id: I87aca396c35ec9f0db74cb9079997a3995efbab5
Alexey Kuzmin [Wed, 5 Jun 2019 01:16:10 +0000 (18:16 -0700)]
Move vibration preview invokation to the correct place
am:
f8eb8c3c90
Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
TreeHugger Robot [Wed, 5 Jun 2019 00:23:38 +0000 (00:23 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Alexey Kuzmin [Tue, 4 Jun 2019 14:59:32 +0000 (15:59 +0100)]
Move vibration preview invokation to the correct place
Bug:
133711461
Bug:
130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting
Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
Bill Yi [Tue, 4 Jun 2019 15:36:03 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815
Alan Stokes [Tue, 4 Jun 2019 14:38:04 +0000 (07:38 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev
am:
c53f5ecb3d
Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
Alan Stokes [Tue, 4 Jun 2019 14:26:29 +0000 (14:26 +0000)]
Merge "Cleanup background activity starts for release." into qt-dev
Kevin Chang [Tue, 4 Jun 2019 01:41:08 +0000 (18:41 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am:
68aa4e4919
Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
Antony Sargent [Tue, 4 Jun 2019 01:39:19 +0000 (18:39 -0700)]
Add a "data during calls" preference
am:
aeb1da0db9
Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
Kevin Chang [Tue, 4 Jun 2019 01:29:21 +0000 (01:29 +0000)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
Antony Sargent [Mon, 13 May 2019 23:44:13 +0000 (16:44 -0700)]
Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.
Bug:
132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
Lei Yu [Mon, 3 Jun 2019 17:03:30 +0000 (10:03 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev
am:
c9fbd2ee50
Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
Lei Yu [Mon, 3 Jun 2019 16:54:29 +0000 (16:54 +0000)]
Merge "Use new API to build NetworkTemplate" into qt-dev
Kevin Chang [Wed, 29 May 2019 10:21:28 +0000 (18:21 +0800)]
Update the string of both magnification settings and gesture navigation tutorial dialog
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0
Bug:
133336814
Bug:
133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
Bill Yi [Sat, 1 Jun 2019 18:36:05 +0000 (11:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
2407b65709 -s ours
am skip reason: subject contains skip directive
Change-Id: Idd7efb56a6182a5374a0ce6cf5ea5114d98532ac
TreeHugger Robot [Sat, 1 Jun 2019 18:17:35 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 1 Jun 2019 17:06:36 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
Mehdi Alizadeh [Fri, 31 May 2019 21:30:18 +0000 (14:30 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am:
cad67cdc0a
Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
Mehdi Alizadeh [Fri, 31 May 2019 21:08:08 +0000 (21:08 +0000)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
Mehdi Alizadeh [Wed, 15 May 2019 18:01:25 +0000 (11:01 -0700)]
Disables the Gesture nav option if 3P launcher is default
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.
Bug:
129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings
Fixes:
119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit
fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
Julia Reynolds [Fri, 31 May 2019 17:42:17 +0000 (10:42 -0700)]
Merge "Update notification settings animation" into qt-dev
am:
1746ccca94
Change-Id: If2fe2025fcdcecd6a432a76b4eac4545249b39dc
Lei Yu [Fri, 31 May 2019 17:41:54 +0000 (10:41 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev
am:
2148c1a207
Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
Julia Reynolds [Fri, 31 May 2019 17:27:09 +0000 (17:27 +0000)]
Merge "Update notification settings animation" into qt-dev
Lei Yu [Tue, 28 May 2019 17:05:44 +0000 (10:05 -0700)]
Use new API to build NetworkTemplate
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.
Bug:
133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
Lei Yu [Fri, 31 May 2019 17:17:51 +0000 (17:17 +0000)]
Merge "Fix issues in battery usage accounting" into qt-dev
Salvador Martinez [Fri, 31 May 2019 16:16:12 +0000 (09:16 -0700)]
Merge "Change switch text color to black in dark mode" into qt-dev
am:
ccbdd834ff
Change-Id: I933e00d2d75fbfe1c1d370f61df5b004bb99ec91
TreeHugger Robot [Fri, 31 May 2019 15:59:42 +0000 (15:59 +0000)]
Merge "Change switch text color to black in dark mode" into qt-dev
Julia Reynolds [Fri, 31 May 2019 13:32:30 +0000 (06:32 -0700)]
Merge "Reorder notification settings" into qt-dev
am:
1abcbaa093
Change-Id: I083414ad1486c393a89622a9d61f4dc8a9703e85
TreeHugger Robot [Fri, 31 May 2019 13:24:17 +0000 (13:24 +0000)]
Merge "Reorder notification settings" into qt-dev
Julia Reynolds [Fri, 31 May 2019 13:18:42 +0000 (09:18 -0400)]
Update notification settings animation
Test: manual
Fixes:
133874971
Change-Id: I8dc399f9de578197322cadbb7cc2c5f75902461d
Joel Galenson [Fri, 31 May 2019 13:07:30 +0000 (06:07 -0700)]
Merge "Remove Permissions Hub." into qt-dev
am:
63088840c4
Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
TreeHugger Robot [Fri, 31 May 2019 13:02:12 +0000 (13:02 +0000)]
Merge "Remove Permissions Hub." into qt-dev
Colin Cross [Fri, 31 May 2019 03:24:25 +0000 (20:24 -0700)]
Merge "Make test_options.timeout an int64" am:
c56651b345
am:
001b1c556d
Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
Colin Cross [Fri, 31 May 2019 03:19:07 +0000 (20:19 -0700)]
Merge "Make test_options.timeout an int64"
am:
c56651b345
Change-Id: If57d4ce65e9e55e89c6e41376b1fa08447062666
Colin Cross [Fri, 31 May 2019 03:11:22 +0000 (03:11 +0000)]
Merge "Make test_options.timeout an int64"
Bill Yi [Fri, 31 May 2019 00:38:37 +0000 (17:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
d1ddb16617 -s ours
am skip reason: subject contains skip directive
Change-Id: Id0af6c3c08db79fbfa30f6c50f3e404d5011a9e5
TreeHugger Robot [Fri, 31 May 2019 00:30:42 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Thu, 30 May 2019 22:17:06 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
Mehdi Alizadeh [Thu, 30 May 2019 22:14:15 +0000 (15:14 -0700)]
Merge "Increase char limit to 60 for string translation" into qt-dev
am:
178d4a7f8f
Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
TreeHugger Robot [Thu, 30 May 2019 22:04:47 +0000 (22:04 +0000)]
Merge "Increase char limit to 60 for string translation" into qt-dev
Colin Cross [Thu, 30 May 2019 21:45:35 +0000 (14:45 -0700)]
[automerger skipped] Merge "Convert Settings to Android.bp" am:
06dfd75660
am:
8ddf9e7e3f -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1
946a0fd964 is in history
Change-Id: I8e7fd2f64f6ccd6ba0f8ef2809a93322a46ac87a
Colin Cross [Thu, 30 May 2019 21:37:45 +0000 (14:37 -0700)]
Merge "Convert Settings to Android.bp"
am:
06dfd75660
Change-Id: Ie863baa7e286a44a8e13b4c5e162f4fecc57de74
Salvador Martinez [Thu, 30 May 2019 21:16:52 +0000 (14:16 -0700)]
Change switch text color to black in dark mode
It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.
Test: visual inspection
Bug:
132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7
Julia Reynolds [Thu, 30 May 2019 21:08:51 +0000 (14:08 -0700)]
Merge "Change notification alert icon" into qt-dev
am:
2821456995
Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
Colin Cross [Thu, 30 May 2019 21:08:37 +0000 (21:08 +0000)]
Merge "Convert Settings to Android.bp"
Julia Reynolds [Thu, 30 May 2019 20:52:08 +0000 (16:52 -0400)]
Reorder notification settings
Test: manual
Fixes:
132271798
Change-Id: I57e726a332513620bea25b97345b1a8564c6d5ef
TreeHugger Robot [Thu, 30 May 2019 20:51:49 +0000 (20:51 +0000)]
Merge "Change notification alert icon" into qt-dev
Christine Franks [Thu, 30 May 2019 20:26:55 +0000 (13:26 -0700)]
Merge "Add SIM color picker" into qt-dev
am:
b747c5c270
Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
Christine Franks [Thu, 30 May 2019 20:01:48 +0000 (20:01 +0000)]
Merge "Add SIM color picker" into qt-dev
Julia Reynolds [Thu, 30 May 2019 19:10:23 +0000 (12:10 -0700)]
Merge "Fix a11y readout of notification importance buttons" into qt-dev
am:
1b25f986cb
Change-Id: I7c94082364ef16412ef2613003c91881905ba12a
TreeHugger Robot [Thu, 30 May 2019 18:53:57 +0000 (18:53 +0000)]
Merge "Fix a11y readout of notification importance buttons" into qt-dev
Julia Reynolds [Thu, 30 May 2019 18:47:07 +0000 (14:47 -0400)]
Change notification alert icon
Test: manual
Bug:
134054170
Change-Id: Ibd66a55a30ac9fbeb7a32638fe236067c6175bc4
Colin Cross [Thu, 30 May 2019 18:32:07 +0000 (11:32 -0700)]
Make test_options.timeout an int64
Test: m RunSettingsRoboTests
Change-Id: I979268540fb50a22316223f432d3c6cbb259f61a
Yi-Ling Chuang [Thu, 30 May 2019 18:18:03 +0000 (11:18 -0700)]
Merge "Load wallpaper colors in a background thread." into qt-dev
am:
7b332d981d
Change-Id: I36b5b699bb4e844083fc2d9b269b1cfe311a3575
Lei Yu [Thu, 30 May 2019 18:00:47 +0000 (11:00 -0700)]
Merge "Update SliceView when slice is null" into qt-dev
am:
f32025a17d
Change-Id: Ic68f9ecae701ed79e11401ec089cf02ab786c4ad
TreeHugger Robot [Thu, 30 May 2019 17:59:54 +0000 (17:59 +0000)]
Merge "Load wallpaper colors in a background thread." into qt-dev
Lei Yu [Thu, 30 May 2019 17:38:59 +0000 (17:38 +0000)]
Merge "Update SliceView when slice is null" into qt-dev
Pavel Grafov [Thu, 30 May 2019 16:06:07 +0000 (09:06 -0700)]
Merge "Make work challenge pattern resizeable." into qt-dev
am:
caa3b34243
Change-Id: I21c4d74ee6540fc47b477bc1113121f00304a472
Joel Galenson [Thu, 30 May 2019 15:30:49 +0000 (08:30 -0700)]
Remove Permissions Hub.
Bug:
132292477
Test: View all related screens.
Change-Id: Ic0e890e04f210f3be3eb80c95e398a40a8062001
Julia Reynolds [Thu, 30 May 2019 14:31:40 +0000 (10:31 -0400)]
Fix a11y readout of notification importance buttons
Test: manual with TB
Bug:
134047401
Change-Id: Idab3426a37ed3f25c2cde47e0747ac9a31850f62
Pavel Grafov [Thu, 30 May 2019 13:38:22 +0000 (13:38 +0000)]
Merge "Make work challenge pattern resizeable." into qt-dev
Raff Tsai [Thu, 30 May 2019 09:56:45 +0000 (02:56 -0700)]
Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev
am:
fde0bee473
Change-Id: Iafe2e30e1fb3bb80c17f2ef651b41d5e8b458a38
TreeHugger Robot [Thu, 30 May 2019 09:39:33 +0000 (09:39 +0000)]
Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev
Raff Tsai [Wed, 29 May 2019 22:39:39 +0000 (06:39 +0800)]
Fix IllegalArgumentException in AudioHelper
Audio streams for phone calls in BT device (STREAM_VOICE_CALL) is not
supported in AudioManager.getStreamMinVolume(), fallback to use
STREAM_VOICE_CALL
Fixes:
133812547
Test: make RunSettingsRoboTests
Change-Id: I8e330f60bae2a7cf9cd0cf7288076b8320ccc504
Sunny Shao [Thu, 30 May 2019 07:00:24 +0000 (00:00 -0700)]
Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am:
3d16fc9519
Change-Id: Id2aa3c501378686d1b3a1b352b8fa15132bc396f
TreeHugger Robot [Thu, 30 May 2019 06:37:12 +0000 (06:37 +0000)]
Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
Mehdi Alizadeh [Thu, 30 May 2019 03:21:03 +0000 (20:21 -0700)]
Increase char limit to 60 for string translation
Bug:
133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
Raff Tsai [Thu, 30 May 2019 01:50:30 +0000 (18:50 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am:
811229a2fd am:
fd058ab872 -s ours am:
3fb5933880 -s ours am:
08672ec74e -s ours
am:
dd7de36bbc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
fe86a2a51f is in history
Change-Id: If8f23bb912f13f355b807358e28f5d74c0bfa066
Raff Tsai [Thu, 30 May 2019 01:44:27 +0000 (18:44 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am:
811229a2fd am:
fd058ab872 -s ours am:
3fb5933880 -s ours
am:
08672ec74e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
fe86a2a51f is in history
Change-Id: I1f06a8e5c931e789518ea1a751a93ecfc73a9090
Raff Tsai [Thu, 30 May 2019 01:40:29 +0000 (18:40 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am:
811229a2fd am:
fd058ab872 -s ours
am:
3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
9fa8329b02 is in history
Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
Raff Tsai [Thu, 30 May 2019 01:38:38 +0000 (18:38 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am:
b95361ab60 -s ours am:
8837b15f78 -s ours
am:
93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
fe86a2a51f is in history
Change-Id: Ic8675a751a6efde129338108c318d4f75ab75518
Raff Tsai [Thu, 30 May 2019 01:35:24 +0000 (18:35 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am:
811229a2fd
am:
fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
e4800786cf is in history
Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
Raff Tsai [Thu, 30 May 2019 01:33:23 +0000 (18:33 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am:
b95361ab60 -s ours
am:
8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
fe86a2a51f is in history
Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7
Raff Tsai [Thu, 30 May 2019 01:30:24 +0000 (18:30 -0700)]
Merge "Do not allow draw on top for App notification settings" into oc-dev
am:
811229a2fd
Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
Raff Tsai [Thu, 30 May 2019 01:28:27 +0000 (18:28 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
am:
b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
9fa8329b02 is in history
Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
TreeHugger Robot [Thu, 30 May 2019 01:14:19 +0000 (01:14 +0000)]
Merge "Do not allow draw on top for App notification settings" into oc-dev
TreeHugger Robot [Thu, 30 May 2019 01:11:01 +0000 (01:11 +0000)]
Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
Raff Tsai [Thu, 30 May 2019 00:36:52 +0000 (17:36 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am:
4d01717c14 -s ours
am:
d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
fe86a2a51f is in history
Change-Id: Id6c85e054c145ef831461a69ed19a85c01b96a7b
Raff Tsai [Thu, 30 May 2019 00:28:49 +0000 (17:28 -0700)]
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev
am:
4d01717c14 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
fe86a2a51f is in history
Change-Id: Ifb49814e6f18d000aafb89652ce26e5469ef0fb5
TreeHugger Robot [Thu, 30 May 2019 00:15:17 +0000 (00:15 +0000)]
Merge "Do not allow draw on top for App notification settings" into pi-dev
Christine Franks [Fri, 24 May 2019 17:52:55 +0000 (10:52 -0700)]
Add SIM color picker
Bug:
133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48
Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
Sunny Shao [Mon, 27 May 2019 03:55:34 +0000 (11:55 +0800)]
Fix the crash while tapping "app data usage" as second user
Second user or guest is limited some mobile network access. We need to check current user
is admin or not to decide the preferece page will be found in search or not.
Bug:
133466016
Fixes:
133466016
Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network
Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52
Colin Cross [Wed, 15 May 2019 22:26:26 +0000 (15:26 -0700)]
Convert Settings to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Test: m RunSettingsRoboTests
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
Merged-In: I267534c095c30833f77273dbdb1893b7830ed45d
OSDN Git Service
