Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,624 Commits 1 Branch 0 Tags
151d5600b18a857548b65069df6ea860e38242c0
Commit Graph

39624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antony Sargent
151d5600b1 Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev 
am: bc6dc5c20c

Change-Id: I64d32e5ac1724ff4c79f1ea4516fa83492a39377
 2017-09-14 03:31:27 +00:00
jackqdyulei
6f98ad5778 Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev 
am: 7853f24405

Change-Id: Ibf4e6c97267fa341913506d258802dc4c6d8d137
 2017-09-14 03:30:48 +00:00
Bill Yi
c899692641 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 
am: 93e8800b21  -s ours

Change-Id: I54abc5cc4a026d0ec271d8d01989ab8ec944f4b7
 2017-09-14 03:29:57 +00:00
Antony Sargent
bc6dc5c20c Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev 2017-09-14 00:04:42 +00:00
TreeHugger Robot
7853f24405 Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev 2017-09-13 23:08:25 +00:00
TreeHugger Robot
93e8800b21 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-09-13 19:34:27 +00:00
Bill Yi
3b1c377d82 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I34c1747c9f05b04794b7f563fc19f53467f21980
 2017-09-13 09:45:46 -07:00
Emilian Peev
11179290a2 Merge "Settings: Add laser sensor preference" into oc-mr1-dev 
am: 22eb007eea

Change-Id: I34ab89bd2a175aa77a78a9a46aea75f148bab284
 2017-09-13 08:40:10 +00:00
jackqdyulei
55b71cf230 Merge "Init the pref summary in onCreate()" into oc-mr1-dev 
am: 7420c095a9

Change-Id: I3b06886495ba3ec6277c84051bee4974c004c9a1
 2017-09-13 08:39:31 +00:00
Xiangyu/Malcolm Chen
5bf7af0154 Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev 
am: 8b6fd21f1e

Change-Id: I1e7c9235b424905f4a0d6fc219b2c8c1e6830cae
 2017-09-13 08:39:05 +00:00
Matthew Fritze
8896df965b Merge "Index the System status page" into oc-mr1-dev 
am: 6203bde8d3

Change-Id: If4350a9cb90e995aa5095c77570055e464103879
 2017-09-13 08:38:40 +00:00
Rebecca Silberstein
91f5a63262 Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev 
am: b975e352a2

Change-Id: I883ab8568ae0393e86de770af08cf7779f18b595
 2017-09-13 08:38:14 +00:00
TreeHugger Robot
22eb007eea Merge "Settings: Add laser sensor preference" into oc-mr1-dev 2017-09-13 07:19:35 +00:00
TreeHugger Robot
7420c095a9 Merge "Init the pref summary in onCreate()" into oc-mr1-dev 2017-09-13 01:38:20 +00:00
Xiangyu/Malcolm Chen
8b6fd21f1e Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev 2017-09-13 01:07:29 +00:00
TreeHugger Robot
6203bde8d3 Merge "Index the System status page" into oc-mr1-dev 2017-09-13 00:06:27 +00:00
TreeHugger Robot
b975e352a2 Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev 2017-09-12 23:20:03 +00:00
jackqdyulei
1a49a8ab39 Turn on wakeupAlarm anomaly detector 
In ag/2642771, wakeup alarms is changed to based on screen-off
timebase. After that, all the wakeup alarms will be background
ones.

So it is safe to turn on the wakeupAlarm anomaly detector.

Bug: 65597330
Test: RunSettingsRoboTests
Change-Id: I653d4bbfa671c52890dc6c6b13870c666ba9b944
 2017-09-12 15:59:52 -07:00
jackqdyulei
1c5d663ed7 Init the pref summary in onCreate() 
The visibility of bottom summary in BatteryHistoryPrefence will
be changed dynamically(charging status + flags). Before this cl,
we only update it in a callback, which makes other preference
may have unnecessary moves.

This cl add init method in onCreate(), which removes the uncessary
preference position moves.

Bug: 65529494
Test: RoboTest still pass
Change-Id: I09d2e26fc3caaeb272422997c16957770cdc1d3f
(cherry picked from commit 65dea0a7b2)
 2017-09-12 22:49:29 +00:00
Matthew Fritze
4b0677a2a4 Index the System status page 
- Page is found in System > About Phone > Status
The page was simply never indexed.

- Remove the unavailable summary text.

- Suppress IP address because it appears in wifi
settings as well.

Test: make RunSettingsRoboTests
Change-Id: I0c5eb5222fc356dd3686fb84ca47da8e2d3274f5
Fixes: 65443327
 2017-09-12 14:18:09 -07:00
Rebecca Silberstein
d52c17c765 Revert back to isDualBandSupported() for Wifi tethering. 
This is needed to maintain OEM compatibility

Bug: 33160120
Test: robotests
Change-Id: Ic302969d33f32da72aee47d29615a250d3d924e2
 2017-09-12 12:46:26 -07:00
Malcolm Chen
26938b36ee In ApnEditor, restore preference values after re-creating. 
After destroying and re-creating, the preference values in ApnEditor
are not restored. This results in incorrect behavior if it enters
two window mode where it's destroyed and re-created. The fix is to
have them restored and shown correctly.

Bug: 65338066
Test: Manual
Change-Id: I5ea16ce01c72061ab116f9c15bfc5cc39bb7a095
 2017-09-12 01:01:09 +00:00
Antony Sargent
a2559ab128 Prevent brief flash of "Error" in hotspot status text 
When toggling the master preference to turn on wifi hotspot, it briefly
changes the status text to "Error" because we have a catch-all in a
function monitoring wifi state changes for unexpected status codes, and
we weren't expecting to see the status of WIFI_AP_STATE_ENABLING before
the status of WIFI_AP_STATE_ENABLED.

Bug: 64811203
Test: make RunSettingsRoboTests
Change-Id: Ifba7abadbfba9ce93cc524b17232c65570f0f428
 2017-09-11 16:50:10 -07:00
debesay guadad
6d5fbfdc72 Merge "Add ims registration status" am: 9b7479f8a9 -s ours am: d3c72406b6 -s ours 
am: 91b143383c  -s ours

Change-Id: Iacba38adf23ae48fa92ca852620fc9232629fa73
 2017-09-11 21:06:31 +00:00
debesay guadad
91b143383c Merge "Add ims registration status" am: 9b7479f8a9 -s ours 
am: d3c72406b6  -s ours

Change-Id: I15bdf67a2be0187682a936d3fe8a0ae42d8329b5
 2017-09-11 20:27:24 +00:00
Android Build Merger (Role)
b7773add7d Merge "Merge "Add ims registration status" into stage-aosp-master am: af845720f6 am: 99768cc46c -s ours" into oc-mr1-dev-plus-aosp 2017-09-11 20:10:25 +00:00
Maurice Lam
4f61cfb967 Merge "Fix sizing of pattern view" into oc-mr1-dev 
am: adef5b23e0

Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
 2017-09-11 20:09:55 +00:00
debesay guadad
d3c72406b6 Merge "Add ims registration status" 
am: 9b7479f8a9  -s ours

Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac
 2017-09-11 20:09:47 +00:00
Antony Sargent
707552888d Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev 
am: b8ff97fbd5

Change-Id: I559aa49ff0ef4aa82a6a1fb989d05c81ac7575fe
 2017-09-11 20:09:25 +00:00
Maurice Lam
adef5b23e0 Merge "Fix sizing of pattern view" into oc-mr1-dev 2017-09-11 20:07:48 +00:00
Maurice Lam
7efcc35d85 Fix sizing of pattern view 
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)

Test: Manual
Bug: 64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
 2017-09-11 20:07:17 +00:00
Brad Ebinger
e4589c3dfb Merge "Add ims registration status" into stage-aosp-master am: af845720f6 
am: 99768cc46c  -s ours

Change-Id: Idcab879ef2b9f1891dbae4309e7a971f48660b97
 2017-09-11 20:06:21 +00:00
Brad Ebinger
99768cc46c Merge "Add ims registration status" into stage-aosp-master 
am: af845720f6

Change-Id: I5daf6e9a55e10d20fc03be6a54801ad6d6533bf8
 2017-09-11 19:54:02 +00:00
TreeHugger Robot
b8ff97fbd5 Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev 2017-09-11 19:52:47 +00:00
Treehugger Robot
9b7479f8a9 Merge "Add ims registration status" 2017-09-11 19:44:31 +00:00
Brad Ebinger
af845720f6 Merge "Add ims registration status" into stage-aosp-master 2017-09-11 19:42:37 +00:00
Amit Mahajan
e886c7c2c1 Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 am: 6ca28e8362 
am: 154779b6af

Change-Id: I90715e84699ac52ce727782917c7a0c75a40e843
 2017-09-11 18:01:35 +00:00
jackqdyulei
52a2d32a37 Merge "Make system item has a consistent name." into oc-mr1-dev 
am: 9a3cb9b835

Change-Id: I928f4266130d488476aadd6dd61a3ce22c579aa2
 2017-09-11 17:53:43 +00:00
Amit Mahajan
154779b6af Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 
am: 6ca28e8362

Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
 2017-09-11 17:51:18 +00:00
Amit Mahajan
6ca28e8362 Merge "Change to disable mvno data field in ApnEditor if needed." 
am: c2c0edff09

Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
 2017-09-11 17:37:55 +00:00
TreeHugger Robot
9a3cb9b835 Merge "Make system item has a consistent name." into oc-mr1-dev 2017-09-11 17:33:09 +00:00
Treehugger Robot
c2c0edff09 Merge "Change to disable mvno data field in ApnEditor if needed." 2017-09-11 17:21:07 +00:00
Antony Sargent
9be8c3fbfe Fix focus behavior of ValidatedEditTextPreference 
The bug report was that the cursor is set to the beginning of the
EditText for wifi hotspot password field, instead of at the end (or
having the entire field selected). This fix makes it so that all
ValidatedEditTextPreference's will put the cursor at the end of the
EditText.

Bug: 65413206
Test: make RunSettingsRoboTests
Change-Id: I23f3bb1b3f1b49b2f193c0ae2e103eae5c1a1019
 2017-09-11 10:12:05 -07:00
Amit Mahajan
ad8eba3097 Change to disable mvno data field in ApnEditor if needed. 
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
 2017-09-11 09:08:49 -07:00
Erik Kline
775807f422 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev 
am: 1b62d99433

Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
 2017-09-11 05:00:34 +00:00
TreeHugger Robot
1b62d99433 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev 2017-09-11 04:56:28 +00:00
Erik Kline
9adc588749 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

Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
 2017-09-11 11:24:45 +09:00
Fan Zhang
ed71e21541 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev 
am: 90f9398f4e

Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
 2017-09-08 22:04:52 +00:00
Daniel Nishi
df0e716b43 Merge "Re-add the block of text explaining the feature." into oc-mr1-dev 
am: 3315f38c3f

Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681
 2017-09-08 22:04:12 +00:00
TreeHugger Robot
90f9398f4e Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev 2017-09-08 21:42:32 +00:00