Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,386 Commits 1 Branch 0 Tags
ab400026df3a4c84d193179f2d07b03405f205da
Commit Graph

8327 Commits

Author SHA1 Message Date
Sean Francis-Lyon
ab400026df am 19c39d27: am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev 
* commit '19c39d275dcbe8453776185f5533ad50146c13ac':
  DO NOT MERGE show correct backup status
 2015-05-22 22:09:40 +00:00
Sean Francis-Lyon
389cf34380 Merge "DO NOT MERGE show correct backup status" into mnc-dev 2015-05-22 20:38:41 +00:00
Jim Miller
e52c0152f8 am 549d5ec8: am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev 
* commit '549d5ec89ecc35a7d91fbd10f982788c135f520d':
  Fix crash in fingerprint settings.
 2015-05-22 02:03:21 +00:00
Jim Miller
c499a5fe9d Merge "Fix crash in fingerprint settings." into mnc-dev 2015-05-22 01:42:27 +00:00
Jim Miller
622142ce9d Fix crash in fingerprint settings. 
Fixes bug 21333219
Fixes bug 21336059

Change-Id: I3e5c9257affd10ace6b55f6d0b2ddbf3babf30f1
 2015-05-21 18:40:02 -07:00
Dave Langemak
0d98b2b796 am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev 
* commit '1c1e85dc5f628c03f484fb51bf13253e7d10feb6':
  Banish Theme setting to developer options
 2015-05-22 00:17:46 +00:00
Dave Langemak
ea9b3198b4 Merge "Banish Theme setting to developer options" into mnc-dev 2015-05-21 23:56:25 +00:00
Sean Francis-Lyon
8452a62216 DO NOT MERGE show correct backup status 
show correct backup status after dismissing are-you-sure dialog
for turnning off backup and restore in settings

Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
(cherry picked from commit f833588dae)
 2015-05-21 22:42:56 +00:00
Jason Monk
df283601c5 Banish Theme setting to developer options 
Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
 2015-05-21 16:46:24 -04:00
Jason Monk
7c1453cd25 am 837dfca0: am ce6f1651: Merge "Fix loading screen one more time" into mnc-dev 
* commit '837dfca0fa82340788846e785f07b0f9a3d9df29':
  Fix loading screen one more time
 2015-05-21 20:38:12 +00:00
Jason Monk
ce6f165104 Merge "Fix loading screen one more time" into mnc-dev 2015-05-21 20:13:37 +00:00
Jason Monk
74ecb1f211 Fix loading screen one more time 
Don't rebuild the app list until the entry load is complete to avoid
having a slowly populating list shown to the user.

Bug: 21086054
Change-Id: I801ab292fdbf6801c1b9c8f957336660810da5f6
 2015-05-21 16:09:41 -04:00
Xiyuan Xia
e383bc2248 am 491a6b13: am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev 
* commit '491a6b13892b6ddc9271ad063ea8b4773b08b924':
  Do not show soft keyboard when locked out
 2015-05-21 18:48:03 +00:00
Jason Monk
8289996dfb am 939ee559: am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev 
* commit '939ee55954b5f8cd4328de8b761385321f2fd773':
  Remove data item from app info when not supported
 2015-05-21 18:43:22 +00:00
Xiyuan Xia
a0e052b17b Merge "Do not show soft keyboard when locked out" into mnc-dev 2015-05-21 16:16:07 +00:00
Jason Monk
b2e07cd0f9 Merge "Remove data item from app info when not supported" into mnc-dev 2015-05-21 12:55:31 +00:00
Jason Monk
b45e27bc0f Remove data item from app info when not supported 
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
 2015-05-21 08:43:25 -04:00
Xiyuan Xia
4a8edaf8b0 Do not show soft keyboard when locked out 
- Remove stateVisible for ConfirmLockPassword activity so that
  soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
  activity window gains focus;

Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
 2015-05-20 14:43:36 -07:00
Jorim Jaggi
4d1e3862c2 am 84caa256: am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 
* commit '84caa2569722b2ee8234c9a6856a32e148f54463':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
 2015-05-20 19:25:47 +00:00
Jorim Jaggi
b56a10368f Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 2015-05-20 19:01:50 +00:00
Lorenzo Colitti
39a67fd5cf am 8f4bf867: am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 
* commit '8f4bf8677c022fe7368ba4c9a96ac9e8de778a70':
  Address TODOs in WifiNoInternetDialog.
 2015-05-20 09:56:41 +00:00
Lorenzo Colitti
f675409e23 Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 2015-05-20 08:04:43 +00:00
Maurice Lam
7a2eae76fc am 12bbde91: am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev 
* commit '12bbde919befdf7d0700e951da5bf334cc248ecd':
  [LockScreen] Update initial string in choose lock screens
 2015-05-20 02:00:01 +00:00
Maurice Lam
efbe46612d Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev 2015-05-20 01:42:42 +00:00
Maurice Lam
163dee9fb7 [LockScreen] Update initial string in choose lock screens 
In choose password and PIN screens, change the initial string from
duplicate of the title ("Choose your password/PIN") to the
verification string ("PIN must be at least ? digits" / "Password must
be at least ? characters").

Bug: 20948877
Change-Id: I635ec625f2820e522cdfc983e13ee71706e7004e
 2015-05-19 17:27:12 -07:00
Fyodor Kupolov
eecff41cfc am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 
* commit 'dc774b618bf8f0ce30b50fe2f4bb0972308a34f7':
  Added SearchIndexProvider for UserSettings
 2015-05-19 22:52:06 +00:00
Jeff Sharkey
1ccf44418e am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev 
* commit '719d0ad90479fc84d0dad1a8fa539b7fee4da746':
  Warn user when adopted device is slow.
 2015-05-19 22:51:15 +00:00
Xiyuan Xia
a61ad9e5e5 am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev 
* commit '0fa945f099364ff05e42899a1da989b12da0a043':
  No input instead of disabling password/pin entry
 2015-05-19 22:51:07 +00:00
Guang Zhu
7375f0df89 am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev 
* commit 'b340980deea8a6948d4e8a602557b5721d45a662':
  Monkey should not be allowed to switch USB mode
 2015-05-19 22:50:48 +00:00
Jason Monk
070b24ade2 am 0a42a67d: am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev 
* commit '0a42a67d4e27fe5b144e2fd41efb8cc273ec63eb':
  Default ignore optimizations to show system apps
 2015-05-19 22:50:34 +00:00
Fyodor Kupolov
c80084e55a Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 2015-05-19 21:44:17 +00:00
Fyodor Kupolov
db80e588c0 am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings." 
* commit 'e84a5eac2cff89a2e380935ee10c685e4b1a58f0':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 21:17:48 +00:00
Jorim Jaggi
712530794b Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2) 
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
 2015-05-19 14:02:05 -07:00
Jeff Sharkey
d0393cd041 Merge "Warn user when adopted device is slow." into mnc-dev 2015-05-19 19:03:35 +00:00
Jeff Sharkey
0de2014380 Warn user when adopted device is slow. 
For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.

Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47
 2015-05-19 12:00:56 -07:00
Fyodor Kupolov
c9a95ef6e7 Added SearchIndexProvider for UserSettings 
It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.

Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242
 2015-05-19 11:31:49 -07:00
Xiyuan Xia
3a310719d8 Merge "No input instead of disabling password/pin entry" into mnc-dev 2015-05-19 18:30:19 +00:00
Guang Zhu
ccfbb1d6ca Merge "Monkey should not be allowed to switch USB mode" into mnc-dev 2015-05-19 18:14:48 +00:00
Guang Zhu
72aa537980 Monkey should not be allowed to switch USB mode 
Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
 2015-05-19 11:09:40 -07:00
Nicolas Prevot
e74fdb8d67 Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev 2015-05-19 17:58:46 +00:00
Jason Monk
2b7685224d Merge "Default ignore optimizations to show system apps" into mnc-dev 2015-05-19 17:57:13 +00:00
Jason Monk
2c56d450dd Default ignore optimizations to show system apps 
Bug: 21211422
Change-Id: Ied526cffa86406b8b81824cf2cdb03cc37bb7433
 2015-05-19 13:08:39 -04:00
Lorenzo Colitti
56bd6c338e Address TODOs in WifiNoInternetDialog. 
Bug: 20081183
Change-Id: I30a4f04ca892796a674ff0306aafaed485126092
 2015-05-20 00:37:38 +09:00
Robin Lee
4dda36a220 am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev 
* commit '7526238a74fe4565a8ed2c29b43e8535650fb4b1':
  Badge managed WiFi networks
 2015-05-19 13:42:54 +00:00
Robin Lee
196d054373 Merge "Badge managed WiFi networks" into mnc-dev 2015-05-19 13:22:10 +00:00
Robin Lee
d234296b96 am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 
* commit 'c0d07e314a74a3910fee969a55e442f045979ed7':
  VPN: UI for forgetting disconnected VPNs
 2015-05-19 10:36:51 +00:00
Robin Lee
b5c48a4c34 Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 2015-05-19 10:15:04 +00:00
Jorim Jaggi
65e43332cc am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev 
* commit 'a351cda36ef5f3f81e6aadeea9f9dc2b36701faf':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
 2015-05-19 05:02:24 +00:00
Jorim Jaggi
a2138a3485 Merge "Add setting to disable assist data (2/2)." into mnc-dev 2015-05-19 04:40:10 +00:00
Jorim Jaggi
bc38a9a0ab Add setting to disable assist data (2/2). 
Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
 2015-05-18 21:38:45 -07:00