Commit Graph

38168 Commits

Author SHA1 Message Date
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
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

Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
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

Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
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

Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
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
Cai, Min1
088baf348b Merge "Refresh payment preference while resume"
am: 05650bb3da

Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
2017-10-16 19:29:33 +00:00
Maurice Lam
d4621f6302 resolve merge conflicts of f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
2017-10-16 18:31:40 +00:00
Daniel Nishi
5973d32c77 Merge "Fix PrivateVolumeSettings be launched repeatedly"
am: 31a7b2a4c7

Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
2017-10-15 03:47:13 +00:00
Treehugger Robot
05650bb3da Merge "Refresh payment preference while resume" 2017-10-13 23:10:13 +00:00
Treehugger Robot
f36b25c2df Merge "There is no NEXT button in find sensor screen of fingerprint." 2017-10-13 21:45:18 +00:00
Daniel Nishi
31a7b2a4c7 Merge "Fix PrivateVolumeSettings be launched repeatedly" 2017-10-13 17:52:58 +00:00
Cai, Min1
0b97d35478 Refresh payment preference while resume
To show latest payment service list on Tap&pay menu.

Test: install payment service and go back to Tap&pay menu
Bug: 67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
2017-10-12 01:12:14 +00:00
Fan Zhang
e39bcb6bf5 Merge "Move SettingsRobolectricTestRunner to testutils."
am: 16db22a9c8  -s ours

Change-Id: I7a4a2d5326b1e617beab32a4be4bfe5b7de7409a
2017-10-11 21:01:23 +00:00
Treehugger Robot
16db22a9c8 Merge "Move SettingsRobolectricTestRunner to testutils." 2017-10-11 20:45:19 +00:00
Fan Zhang
df94389492 Move SettingsRobolectricTestRunner to testutils.
Change-Id: Ia0017983b844cabafc10478adf4839f5755f514c
Merged-In: I6612b1f26404587301c534c8ba60e39d59d6c840
Fixes: 67688380
Test: robotests
2017-10-11 12:27:12 -07:00
Li YanJia
b699603f68 Fix PrivateVolumeSettings be launched repeatedly
Symptom:
After manually pull out the removable sd card or usb storage in
StorageSettings screen, it automatically moves to
PrivateVolumeSettings screen. This time, launching
PrivateVolumeSettings Activity is triggered six times and end-user
has to press back key six times to exit PrivateVolumeSettings
screen.

Root cause:
When sd card is pulled out, StorageSettings got three state change
event (UNMOUNTED, BAD_REMOVAL and onDiskDestroyed) through
StorageEventListener that triggers launching PrivateVolumeSettings
screen. In addition StorageSettings register the listener two
times, then StorageSettings receives six event in total.
Therefore, PrivateVolumeSettings screen is launched six times.

Solution:
Skip launching PrivateVolumeSettings if it's already triggered.
And removed the duplicated listener registration.

Bug: 67612903

Change-Id: Iabef51677a393977b7be29fc54aa050434213500
2017-10-10 12:49:32 +09:00
edgar.huang
bd0d33e3bd There is no NEXT button in find sensor screen of fingerprint.
Precondition: set the Font size and Display size to largest
Enter into the find sensor screen and the NEXT button is missing.
Test: manual - Enter into the find sensor screen -
and can find the NEXT button after sliding the screen.

Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I8f6219ab22abad98111f016d633bf100dc3222ce
2017-10-10 01:51:33 +00:00
Ben Schwartz
e9130feb37 Add a developer option for controlling DNS over TLS
Bug: 63449024
Test: Manual.  Appears to work.
Change-Id: I1b354c5cbfe761432235284232d993f028a8e18d
2017-10-04 16:19:06 -04:00
Carsten Hauge
f38ed428dc Merge "Avoid NullPointerException when updating preference intents"
am: c4b0fa5858

Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f
2017-10-02 18:03:40 +00:00
Treehugger Robot
c4b0fa5858 Merge "Avoid NullPointerException when updating preference intents" 2017-10-02 17:56:02 +00:00
Carsten Hauge
f35cb6bc91 Avoid NullPointerException when updating preference intents
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.

Fixes: 67075850
Test: manual - go to Settings > Users & accounts and tap an account.

Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
2017-10-02 02:01:49 +00:00
songkailun
39ddac51b6 Merge "Fix wrong format in AndroidManifest.xml"
am: de795d12d1

Change-Id: I443534ac7e122e337102d41c4138a0e94be72f7f
2017-09-29 09:37:17 +00:00
Treehugger Robot
de795d12d1 Merge "Fix wrong format in AndroidManifest.xml" 2017-09-29 06:45:30 +00:00
songkailun
7d2a5901f7 Fix wrong format in AndroidManifest.xml
N/A

Change-Id: Idf3b9c22e65d15013f5e3e2f5a1e9719d35ede3a
Signed-off-by: songkailun <songkailun@xiaomi.com>
2017-09-29 09:42:05 +08:00
Lei Yang
a40f7c0f5e Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
am: d2f42970bf

Change-Id: Iecac3e7e8a04356f377a2d8886bb86f70c0ab96e
2017-09-26 23:35:26 +00:00
Treehugger Robot
d2f42970bf Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" 2017-09-26 23:21:44 +00:00
Lei Yang
58fca6385a Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled
"Set up Wi-Fi NFC Tag" dialog cannot be scrolled and "Show password"
is not displayed when setting Font size and Display size to Largest.
To fix this issue, ScrollView should be added.

Fixes: 66936807
Test: manual - long tap a connected Wi-Fi AP and
               tap "Write to NFC tag".

Change-Id: I3edcf3c2b9db47319e18405066bcb835b064b690
2017-09-26 10:20:29 +00:00
Colin Cross
00c0d436f4 Merge "Remove unnecessary core-oj library"
am: a37bf5616a

Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db
2017-09-26 01:18:50 +00:00
Treehugger Robot
a37bf5616a Merge "Remove unnecessary core-oj library" 2017-09-26 01:12:30 +00:00
Colin Cross
6be287a209 Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.

Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
2017-09-23 22:09:31 -07:00
Doris Ling
296c46404c Merge "Fix NPE crash in UsageAccessDetails"
am: cd959f28a0

Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
2017-09-21 19:24:52 +00:00
Doris Ling
cd959f28a0 Merge "Fix NPE crash in UsageAccessDetails" 2017-09-21 19:21:03 +00:00
tiansiming
39de7aedee Fix NPE crash in UsageAccessDetails
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java

Bug:https://issuetracker.google.com/issues/65872768
Test:As explained in the link above

Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-09-21 14:12:50 +08:00
Doris Ling
0533f9ff4a Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd
2017-09-15 01:33:16 +00:00
Doris Ling
939265d6ea Merge "Default apps settings disappear when switching to secondary user" 2017-09-14 22:13:58 +00:00
edgar.huang
f95e7f9056 Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am: 62a021850f

Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3
2017-09-14 20:37:15 +00:00
Treehugger Robot
62a021850f Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." 2017-09-14 20:28:55 +00:00
Erik Kline
d3f4a27c59 Merge changes Icd3d09aa,I4b070964
am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
2017-09-14 08:14:09 +00:00
Treehugger Robot
a0661c4fdf Merge changes Icd3d09aa,I4b070964
* changes:
  Include IPv6 DNS servers in wifi details
  Separate multiple DNS addresses with newlines.
2017-09-14 08:10:25 +00:00
Erik Kline
5b206aec69 Include IPv6 DNS servers in wifi details
Test: as follows
    - built
    - flashed
    - booted
    - export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
          make -j RunSettingsRoboTests
      RunSettingsRoboTests:
      RunSettingsRoboTests: Time: 19.821
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (37 tests)
      RunSettingsRoboTests:
    - make -j RunSettingsRoboTests
      RunSettingsRoboTests: ...........................
      RunSettingsRoboTests: Time: 424.847
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (2250 tests)
      RunSettingsRoboTests:

Bug: 65037256
Bug: 65467586

Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit 9adc588749)
2017-09-14 14:48:50 +09:00
Sundeep Ghuman
049d515dc4 Separate multiple DNS addresses with newlines.
Bug: b/65037256
Bug: 65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit 2716e841be)
2017-09-14 11:38:12 +09:00