OSDN Git Service
jeffreyhuang [Fri, 20 Oct 2017 21:10:25 +0000 (14:10 -0700)]
Introduce MemoryUsagePreferenceController
- Use a hard-coded preference instead of injecting
so that search can index the preference
- Create a preference controller to update the summary
Change-Id: Idf822ccbb7a58a9ec561d5c2c2948dbc3272544f
fixes:
36463051
Test: Manual using settings app
TreeHugger Robot [Fri, 20 Oct 2017 16:55:37 +0000 (16:55 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
Jeffrey Huang [Fri, 20 Oct 2017 16:45:51 +0000 (16:45 +0000)]
Merge changes Icddb9d35,I36f76f93,Ie7b6afa5
* changes:
Add existing controllers in about phone to v2 fork
Create XML layout for about phone v2
Fork a new about phone layout
Ben Schwartz [Fri, 20 Oct 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343 am:
ed97eaeb4a am:
1fd46833ef
am:
2372074d57
Change-Id: I0ae492cccd6c7031abab23cc77310e09c04a6872
Ben Schwartz [Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343 am:
ed97eaeb4a
am:
1fd46833ef
Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
Ben Schwartz [Fri, 20 Oct 2017 15:15:14 +0000 (15:15 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343
am:
ed97eaeb4a
Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
Ben Schwartz [Fri, 20 Oct 2017 15:06:10 +0000 (15:06 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
am:
c8207de343
Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
TreeHugger Robot [Thu, 19 Oct 2017 23:18:17 +0000 (23:18 +0000)]
Merge "Misc logging improvements"
jeffreyhuang [Thu, 19 Oct 2017 21:46:32 +0000 (14:46 -0700)]
Add existing controllers in about phone to v2 fork
- Added build number controller
- Added safety info controller
- Added regulatory info controller
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Icddb9d352b4f739ca1c7cf562dec09530cb41dac
jeffreyhuang [Thu, 19 Oct 2017 21:29:28 +0000 (14:29 -0700)]
Create XML layout for about phone v2
- Added all the necessary preferences in the xml layout
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I36f76f9360b809eba077497db68d012098820868
TreeHugger Robot [Thu, 19 Oct 2017 21:47:21 +0000 (21:47 +0000)]
Merge "Fingerprint enrolling should update UI while in multi-window mode"
jeffreyhuang [Thu, 19 Oct 2017 20:36:40 +0000 (13:36 -0700)]
Fork a new about phone layout
- Used a feature flag to hide the new about phone page
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ie7b6afa58b301128d1c60513ae4ee48d6ec6679b
tiansiming [Thu, 19 Oct 2017 19:29:11 +0000 (19:29 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef am:
92e77cbd43 am:
ecf2bdb46f
am:
cca755cfac
Change-Id: Ibe3700977ed96afe09e0b15ceecf125edeb6d23b
tiansiming [Thu, 19 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef am:
92e77cbd43
am:
ecf2bdb46f
Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
tiansiming [Thu, 19 Oct 2017 19:22:16 +0000 (19:22 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef
am:
92e77cbd43
Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
tiansiming [Thu, 19 Oct 2017 19:20:09 +0000 (19:20 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
am:
3a3044eeef
Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
Fix wrong position of cursor in IccLockSettings
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/
67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Bill Yi [Thu, 19 Oct 2017 01:17:06 +0000 (18:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I077bf16890d37404acb52c6ee1fdf584a978e094
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 18 Oct 2017 23:35:13 +0000 (23:35 +0000)]
Merge "Cleanup Controllers/Fragments"
TreeHugger Robot [Wed, 18 Oct 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Convert more loadIcon() to IconDrawableFactory"
TreeHugger Robot [Wed, 18 Oct 2017 23:10:12 +0000 (23:10 +0000)]
Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"
Jeff Sharkey [Wed, 18 Oct 2017 23:00:49 +0000 (23:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8 am:
1dcb8522fa
am:
937ede14d8 -s ours
Change-Id: I8c23627db5650e7547b79a38d91754aa7cd67418
Jeff Sharkey [Wed, 18 Oct 2017 23:00:17 +0000 (23:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8 am:
1e23fc8814
am:
9220dda5b8 -s ours
Change-Id: I96930790d6006cb843667edb70fd1fe051f05649
Jeff Sharkey [Wed, 18 Oct 2017 22:59:45 +0000 (22:59 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8 am:
6b56423651
am:
0f1d957bb3 -s ours
Change-Id: Ia5e090ac74029698f5d8c48712cbed64605ae977
Jeff Sharkey [Wed, 18 Oct 2017 22:58:42 +0000 (22:58 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8 am:
e39f0c21f9
am:
b5f7753e18 -s ours
Change-Id: Icbc6d2a281b151fdcc60772cb3978c8592a685d7
Jeff Sharkey [Wed, 18 Oct 2017 22:55:51 +0000 (22:55 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
1dcb8522fa
Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9
Jeff Sharkey [Wed, 18 Oct 2017 22:54:01 +0000 (22:54 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
1e23fc8814
Change-Id: Id4d0641a44fb537a5606e8c118ffdbc93aaf0ae2
Fan Zhang [Wed, 18 Oct 2017 22:27:13 +0000 (15:27 -0700)]
Misc logging improvements
- Log ACTION_SEARCH_RESULTS whenever a search query is performed.
eg, type "qu" will result 2 such logging events.
- Remove historam logging to search result click count (already logged
as ACTION_CLICK_SETTINGS_SEARCH_RESULT)
Change-Id: Ia207b34702e0f24a7885e47d093f6cce1314ebc4
Fixes:
67743512
Fixes:
64939544
Test: robotests
Jeff Sharkey [Wed, 18 Oct 2017 22:27:47 +0000 (22:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
6b56423651
Change-Id: I18058b80f7f7439f875213d5f6e59b2680cc3dc5
Jeff Sharkey [Wed, 18 Oct 2017 22:26:30 +0000 (22:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
e39f0c21f9
Change-Id: Ib7da524b1e6c64ded9706fedfe487aa99d43e22a
jeffreyhuang [Wed, 18 Oct 2017 22:03:41 +0000 (15:03 -0700)]
Cleanup Controllers/Fragments
- Removed extra comments in DevelopmentSettingsDashboardFragment
- Removed unused methods from controllers
- Clean up method names
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ibe7a0921926d4529f62a212b55c8fa2f14ecb18b
Fan Zhang [Wed, 18 Oct 2017 00:04:04 +0000 (17:04 -0700)]
Convert more loadIcon() to IconDrawableFactory
- AppGridView: used by preview chart in display size setting.
- DefaultBrowserPreferenceController: default browser icon in default
apps settings
- Enterprise application list
- Accessibility search result loader
Change-Id: Ibd12cd8854c68760ea3428fffa735bcbba48a277
Fixes:
64336923
Test: robotests
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
Jeff Sharkey [Wed, 18 Oct 2017 21:52:01 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I83e412e91bdc14523b26ac11fc0918a21b74a26f
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
Jeff Sharkey [Wed, 18 Oct 2017 21:50:29 +0000 (21:50 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: Id3c4eafd2628d04b94e33e057b228ed77c9c32c8
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da
am:
8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
TreeHugger Robot [Wed, 18 Oct 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Fix a monkey crash: guard against position -1."
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd
am:
85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Fan Zhang [Wed, 18 Oct 2017 18:47:01 +0000 (11:47 -0700)]
Fix a monkey crash: guard against position -1.
When handling onClick in ManageApplications, skip getAppEntry if
position is -1.
Change-Id: I565c42b2c9f742445e49fd4c2e7db539d0f6f8ad
Fixes:
67940121
Test: manual
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
TreeHugger Robot [Wed, 18 Oct 2017 17:47:33 +0000 (17:47 +0000)]
Merge "Use IconDrawableFactory to load icons for default apps."
TreeHugger Robot [Wed, 18 Oct 2017 17:30:47 +0000 (17:30 +0000)]
Merge "Fix a bug: applied wrong layout for advanecd button flag"
TreeHugger Robot [Wed, 18 Oct 2017 15:53:59 +0000 (15:53 +0000)]
Merge "Adjusting char limits in zen mode settings."
Beverly [Wed, 18 Oct 2017 13:50:40 +0000 (09:50 -0400)]
Adjusting char limits in zen mode settings.
Test: manual
Change-Id: I9fd1f2bcb01f83b464877a3f3c7de3e28249126e
Fixes:
67871480
TreeHugger Robot [Wed, 18 Oct 2017 02:20:06 +0000 (02:20 +0000)]
Merge "Switch to recyclerview in ManageApplications"
Fan Zhang [Thu, 12 Oct 2017 18:09:24 +0000 (11:09 -0700)]
Switch to recyclerview in ManageApplications
- Replace ListView with RecyclerView in layout
- Replace ApplicationAdapter's superclass to be RecyclerView.Adapter
- Change adapter interfaces (where necessary) to work with RecyclerView
- Replace fast scroll with Recycler's mechanism (all in xml)
- Removed section indexer (text bubble when fast scroll) because
recyclerview doesn't support it.
Bug:
64804294
Test: robotests
Change-Id: I55b221836ce6abdeddf4568c8a8a5632cbddbd3b
Fan Zhang [Tue, 17 Oct 2017 18:35:37 +0000 (11:35 -0700)]
Use IconDrawableFactory to load icons for default apps.
Bug:
64336923
Test: robotests
Change-Id: I2a4ca05a866784f97e247bad1c1679a6ec0f5efa
Jeffrey Huang [Tue, 17 Oct 2017 22:30:58 +0000 (22:30 +0000)]
Merge "Hide dev options v1 under feature flag"
Christopher Tate [Tue, 17 Oct 2017 21:39:24 +0000 (14:39 -0700)]
Use correct flags on ACTION_TIME_CHANGED broadcast
When Settings changes the display format for 12/24 hour time, it fakes
an ACTION_TIME_CHANGED broadcast to provoke apps to update their display.
It needs to use the right flags on that broadcast to match the way the
OS sends it when the time actually changes.
Bug:
67881917
Test: calendar widget, Deskclock, QCT timeservice
Change-Id: I46ce261c36d9c7180f6b8eae806ef9fbf271fa53
Fan Zhang [Tue, 17 Oct 2017 21:49:04 +0000 (14:49 -0700)]
Fix a bug: applied wrong layout for advanecd button flag
Change-Id: I5a44bb5e910bc73e46087820e5ccf76e220fa834
Fixes:
3076430
Test: robotests
TreeHugger Robot [Tue, 17 Oct 2017 21:31:27 +0000 (21:31 +0000)]
Merge changes I145c2e25,I4abe87dd,I86575d17,I90a0e583
* changes:
Introduce BluetoothAudioQualityPreferenceCtrl
Introduce BluetoothAudioChannelModePreferenceCtrl
Introduce BluetoothAudioBitsPerSamplePrefCtrl
Introduce BluetoothAudioCodecPreferenceController
jeffreyhuang [Tue, 17 Oct 2017 18:05:15 +0000 (11:05 -0700)]
Hide dev options v1 under feature flag
- Cutover to DevelopmentSettingsDashboardFragment
- Add dev_option_v1 feature flag
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I2ff7b5c55f1f27cd24b4e276d3d81a73f67dcf88
TreeHugger Robot [Tue, 17 Oct 2017 19:10:29 +0000 (19:10 +0000)]
Merge "Add work-only-category controller"
jeffreyhuang [Fri, 13 Oct 2017 21:27:10 +0000 (14:27 -0700)]
Introduce BluetoothAudioQualityPreferenceCtrl
- Create new BluetoothAudioQualityPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I145c2e2554f5e9f5e7cfa79b3f6198a8b81105ec
jeffreyhuang [Fri, 13 Oct 2017 21:03:22 +0000 (14:03 -0700)]
Introduce BluetoothAudioChannelModePreferenceCtrl
- Create new BluetoothAudioChannelModePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I4abe87dd70be83c8b3cf2a3ad43b8856a01eadbb
jeffreyhuang [Fri, 13 Oct 2017 20:43:21 +0000 (13:43 -0700)]
Introduce BluetoothAudioBitsPerSamplePrefCtrl
- Create new BluetoothAudioBitsPerSamplePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I86575d171a005f62f731d9001f08ddcf976ad826
jeffreyhuang [Thu, 12 Oct 2017 23:39:26 +0000 (16:39 -0700)]
Introduce BluetoothAudioCodecPreferenceController
- Create new BluetoothAudioCodecPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I90a0e58328196315fccbecd6d46531b4f0fcaef1
Pavel Grafov [Tue, 17 Oct 2017 17:35:30 +0000 (17:35 +0000)]
Preserve old password when handling SET_NEW_PASSWORD. am:
40e187b364
am:
51f15da8e6
Change-Id: I9b46697d14579ab8aedfffcdfd14ddc02cad5cf0
Fan Zhang [Tue, 17 Oct 2017 01:21:00 +0000 (18:21 -0700)]
Add work-only-category controller
The controller will hide category if there is no child in it.
Change-Id: I9bbcc4115b991574e608933f98857b0b4eb2ed7d
Fixes:
62185871
Test: robotests
Pavel Grafov [Tue, 17 Oct 2017 17:33:23 +0000 (17:33 +0000)]
Preserve old password when handling SET_NEW_PASSWORD.
am:
40e187b364
Change-Id: I45a464c244b6de3a4ea491d28db620425733b5a8
Jeffrey Huang [Tue, 17 Oct 2017 17:22:31 +0000 (17:22 +0000)]
Merge "Lazy load SettingsObserver"
TreeHugger Robot [Tue, 17 Oct 2017 16:04:20 +0000 (16:04 +0000)]
Merge "Adjusted char limits and media/system string."
Beverly [Mon, 16 Oct 2017 20:38:19 +0000 (16:38 -0400)]
Adjusted char limits and media/system string.
Change-Id: Iad4d9980fc52970d1ee8221053dd116c5bbcd9cb
Fixes:
67821000
Fixes:
67827886
Fixes:
67820998
Test: manual
Pavel Grafov [Wed, 11 Oct 2017 21:57:09 +0000 (22:57 +0100)]
Preserve old password when handling SET_NEW_PASSWORD.
Currently the only way mUserPassword can be set is when it comes
from onActivityResult. This way when the user chooses "Continue
without Pixel Imprint", and we switch ChooseLockGeneric->InternalActivity,
mUserPassword becomes null (it is not preserved in intent extras).
And then this null is used in getLockPasswordIntent which causes the issue.
Another issues is that when the user chooses to use fingerprint,
mHasChallenge is set to true and password is not forwarded to
ChooseLock(Password|Pattern). I changed the intent builders so that both
old password and challenge can be sent at the same time, so the password
is not lost when fingerprint is set.
Bug:
67672081
Test: cd packages/apps/Settings/tests/robotests/ && mma
Test: manual, adb shell am start -a android.app.action.SET_NEW_PASSWORD,
tried setting pin/password with and without fingerprint.
Test: manual, tried to change lock via Settings -> Security&Location
Test: manual, set pin + fingerprint in Setup Wizard, FBE and FDE devices
Test: manual, set pin + added account, used pin to unlock FRP in SUW
Change-Id: I38d56d84f95c63fef24c2aa1a031d629f22756a1
TreeHugger Robot [Tue, 17 Oct 2017 02:09:45 +0000 (02:09 +0000)]
Merge "Add advanced button to security & location page"
TreeHugger Robot [Tue, 17 Oct 2017 01:15:45 +0000 (01:15 +0000)]
Merge "Reorder default app summary to match subpage ordering"
Fan Zhang [Tue, 17 Oct 2017 00:16:53 +0000 (17:16 -0700)]
Add advanced button to security & location page
Change-Id: I45977105d6ddabef8f2d9bdc7b46959af9cbbf0f
Fixes:
36657221
Test: visual
jeffreyhuang [Mon, 16 Oct 2017 23:56:26 +0000 (16:56 -0700)]
Lazy load SettingsObserver
- Lazy load the SettingsObserver in StayAwakePreferenceController
so that search indexing works properly
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I1e2afb106ce293f616143da3f37fbde3829f414f
Fan Zhang [Mon, 16 Oct 2017 23:42:27 +0000 (16:42 -0700)]
Reorder default app summary to match subpage ordering
Change-Id: I618f44ba8cf6f590b86d483cfecb090b71ef1268
Fixes:
65049890
Test: robotests
Cai, Min1 [Mon, 16 Oct 2017 21:45:23 +0000 (21:45 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da am:
088baf348b am:
f523ca10aa
am:
84a60e3cf3
Change-Id: I037f72265acc57e531edc337e3e523ece20063a3
Maurice Lam [Mon, 16 Oct 2017 21:43:55 +0000 (21:43 +0000)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master am:
d4621f6302 am:
0e1c486e74
am:
c03cf0092e -s ours
Change-Id: Ie9d2e04136be07b90bdb49f4fcceb259c95dee4a
Cai, Min1 [Mon, 16 Oct 2017 19:59:50 +0000 (19:59 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da am:
088baf348b
am:
f523ca10aa
Change-Id: I25dea8b9ddb1740c907d4ef79c74fe8b201352a2
Cai, Min1 [Mon, 16 Oct 2017 19:41:44 +0000 (19:41 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da
am:
088baf348b
Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d
Cai, Min1 [Mon, 16 Oct 2017 19:29:33 +0000 (19:29 +0000)]
Merge "Refresh payment preference while resume"
am:
05650bb3da
Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
Maurice Lam [Mon, 16 Oct 2017 19:25:57 +0000 (19:25 +0000)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master am:
d4621f6302
am:
0e1c486e74
Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e
Maurice Lam [Mon, 16 Oct 2017 19:22:12 +0000 (19:22 +0000)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master
am:
d4621f6302
Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0
Maurice Lam [Mon, 16 Oct 2017 18:30:19 +0000 (11:30 -0700)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
OSDN Git Service
