Jeff Sharkey
efe4b48d9b
Change storage migration to use quota APIs.
...
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
(cherry picked from commit fc522c677d
2017-10-31 09:48:11 -07:00
xiyuan.wang
5cf3dcd11c
Merge "Fix app crash while adding new user"
...
am: 1e5cd4c3df
2017-10-30 18:03:09 +00:00
Treehugger Robot
1e5cd4c3df
Merge "Fix app crash while adding new user"
2017-10-30 17:43:46 +00:00
xiyuan.wang
b6fa43d980
Fix app crash while adding new user
...
Settings app crashes when tapping Home key while adding new user because
UserSettings#showDialog() is called after onSaveInstanceState().
To fix this issue, a dialog should not be shown after onPause().
Fixes: 68485787
Test: manual - tap Home key while adding new user
Change-Id: I2ddd119b6558927798a52c7977e6fd8137734c93
2017-10-30 19:55:56 +09:00
Qi Ding
35a3260b91
Merge "Fix current tab is changed when rotating device"
...
am: 3d8b442e8d
2017-10-27 18:47:40 +00:00
Treehugger Robot
3d8b442e8d
Merge "Fix current tab is changed when rotating device"
2017-10-27 18:38:37 +00:00
Qi Ding
4ca4bd31c3
Fix current tab is changed when rotating device
...
Even if SIM slot 2 is selected in SIM card lock settings,
the current tab is changed to SIM slot 1 when rotating the device.
To fix this issue, the current tab should be restored
after rotating the device.
Fixes: 63690125
Test: manual - go to Settings > Security > SIM card lock
and rotate device
Change-Id: I874d4d06019e21dd7b65951a3aefb75ff5ea298b
2017-10-26 14:39:03 +09:00
Bill Yi
2ef76cb0d2
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: aa8a972ea3
2017-10-24 20:33:44 +00:00
Fan Zhang
e373209b97
Merge "Fix wrong position of cursor in OwnerInfoSettings"
...
am: 2bcbc35b29
2017-10-24 20:33:03 +00:00
Bill Yi
aa8a972ea3
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
2017-10-24 11:32:26 -07:00
Fan Zhang
2bcbc35b29
Merge "Fix wrong position of cursor in OwnerInfoSettings"
2017-10-24 18:13:25 +00:00
tiansiming
7206a2998d
Fix wrong position of cursor in OwnerInfoSettings
...
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-10-24 17:19:27 +08:00
Jack Yu
3966912efa
Merge "Refactored area update info support"
...
am: 60d6ffbc6c
2017-10-20 19:30:29 +00:00
Treehugger Robot
60d6ffbc6c
Merge "Refactored area update info support"
2017-10-20 19:19:09 +00:00
TreeHugger Robot
a5d652c89f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:28:33 +00:00
Ben Schwartz
ed97eaeb4a
Merge "Add a developer option for controlling DNS over TLS"
...
am: c8207de343
2017-10-20 15:06:10 +00:00
Treehugger Robot
c8207de343
Merge "Add a developer option for controlling DNS over TLS"
2017-10-20 14:58:39 +00:00
Bill Yi
074e2ee9ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
2017-10-20 03:21:50 -07:00
Jack Yu
2f010230df
Refactored area update info support
...
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit c3cab8ecb8
2017-10-19 17:36:33 -07:00
tiansiming
92e77cbd43
Merge "Fix wrong position of cursor in IccLockSettings"
...
am: 3a3044eeef
2017-10-19 19:20:09 +00:00
Treehugger Robot
3a3044eeef
Merge "Fix wrong position of cursor in IccLockSettings"
2017-10-19 19:14:49 +00:00
tiansiming
64f48b5ce6
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 >
2017-10-20 01:26:40 +08:00
Jeff Sharkey
937ede14d8
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
2017-10-18 22:55:51 +00:00
Jeff Sharkey
9220dda5b8
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
2017-10-18 22:54:01 +00:00
Jeff Sharkey
0f1d957bb3
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
2017-10-18 22:27:47 +00:00
Jeff Sharkey
b5f7753e18
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
2017-10-18 22:26:30 +00:00
Jeff Sharkey
6b56423651
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
2017-10-18 21:52:46 +00:00
Jeff Sharkey
1dcb8522fa
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
2017-10-18 21:52:01 +00:00
Jeff Sharkey
e39f0c21f9
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
2017-10-18 21:51:30 +00:00
Jeff Sharkey
1e23fc8814
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
2017-10-18 21:50:29 +00:00
Jeff Sharkey
16776b64c8
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
2017-10-18 21:32:46 +00:00
Jeff Sharkey
3de9e565c8
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
2017-10-18 21:31:42 +00:00
Jeff Sharkey
a00521b3a0
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
2017-10-18 21:01:38 +00:00
Jeff Sharkey
a829548c12
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
2017-10-18 21:00:49 +00:00
Jeff Sharkey
a637e31547
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
2017-10-18 20:40:16 +00:00
Jeff Sharkey
2a2d92eee8
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
2017-10-18 20:39:11 +00:00
Jeff Sharkey
397a3555b5
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
2017-10-18 20:26:31 +00:00
Jeff Sharkey
8f2a69fad3
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
2017-10-18 20:25:25 +00:00
Jeff Sharkey
629553fb49
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
2017-10-18 20:06:55 +00:00
Jeff Sharkey
85cb0b43da
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
2017-10-18 20:06:00 +00:00
Jeff Sharkey
d88820f3f6
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
2017-10-18 19:40:12 +00:00
Jeff Sharkey
e341fe95bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours
...
am: 416ecb20a3
2017-10-18 19:39:10 +00:00
Jeff Sharkey
07c4c8efed
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716
...
am: 91b1cb4b23
2017-10-18 19:27:49 +00:00
Jeff Sharkey
416ecb20a3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0
...
am: fad1e6a315
2017-10-18 19:27:11 +00:00
Jeff Sharkey
91b1cb4b23
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c
...
am: a954c8c716
2017-10-18 19:21:53 +00:00
Jeff Sharkey
fad1e6a315
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9
...
am: c1ebc09ff0
2017-10-18 19:20:50 +00:00
Jeff Sharkey
a954c8c716
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39
...
am: 2bf724509c
2017-10-18 18:57:57 +00:00
Jeff Sharkey
c1ebc09ff0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787
...
am: 9ba609cef9
2017-10-18 18:57:03 +00:00
Jeff Sharkey
2bf724509c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours
...
am: 19fa568b39
2017-10-18 18:40:10 +00:00
Jeff Sharkey
9ba609cef9
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours
...
am: 5b2a431787
2017-10-18 18:39:25 +00:00
