PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,764 Commits 1 Branch 0 Tags
a8491f348ef1a1f10278a83bb33b2b38723fb30c
Commit Graph

20764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Langemak
1c1e85dc5f am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev 
* commit 'ea9b3198b43ac7c67c9a4ff3e27bb133fd0c6293':
  Banish Theme setting to developer options
 2015-05-22 00:06:18 +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
Maurice Lam
03d1299646 am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 
* commit '51eec32afa0d4599b437b1823a2b42d44d9bf001':
  [LockScreenSetup] Move retry button to top
 2015-05-21 22:06:29 +00:00
Maurice Lam
51eec32afa Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 2015-05-21 21:55:48 +00:00
Jorim Jaggi
c8f78ec956 am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev 
* commit '19ea8b703455cf326e7c481e33e757ff0ddfed62':
  Fix string for fingerprint settings
 2015-05-21 21:32:37 +00:00
Jorim Jaggi
19ea8b7034 Merge "Fix string for fingerprint settings" into mnc-dev 2015-05-21 21:23:57 +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
837dfca0fa am ce6f1651: Merge "Fix loading screen one more time" into mnc-dev 
* commit 'ce6f165104fb8c567c13369bae97935e29c47f4c':
  Fix loading screen one more time
 2015-05-21 20:26:21 +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
491a6b1389 am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev 
* commit 'a0e052b17b0c730dcd61ad2787c041c75107f106':
  Do not show soft keyboard when locked out
 2015-05-21 16:22:30 +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
939ee55954 am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev 
* commit 'b2e07cd0f9e2a869710c6b713f403afc4fbdbfab':
  Remove data item from app info when not supported
 2015-05-21 13:05:57 +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
The Android Automerger
f74ae87f35 merge in mnc-release history after reset to mnc-dev 2015-05-21 01:04:45 -07:00
Geoff Mendal
e008b99d44 am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '462e70083fbdd12da55b6a6b98a59750d250f40d':
  Import translations. DO NOT MERGE
 2015-05-21 03:30:37 +00:00
John Spurlock
8b9dbbe0c8 am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev 
* commit 'fffa7f905b809659c3edbbb1663f3a74ce5625bc':
  Settings: Auto-capitalize edit text for zen autorule names.
 2015-05-21 03:30:36 +00:00
Geoff Mendal
462e70083f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 03:26:57 +00:00
Geoff Mendal
bcb20a9f52 Import translations. DO NOT MERGE 
Change-Id: Ibf8eea922fe4322ec29f6837bfb399c85b4cfbcf
Auto-generated-cl: translation import
 2015-05-20 20:20:56 -07:00
John Spurlock
fffa7f905b Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev 2015-05-21 03:19:20 +00:00
John Spurlock
b3d2f08e24 Settings: Auto-capitalize edit text for zen autorule names. 
Bug: 21337479
Change-Id: I424adf94a0717cb4ca75576e2047cbaf387bb947
 2015-05-20 23:14:49 -04:00
Maurice Lam
a9a04efe89 [LockScreenSetup] Move retry button to top 
Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.

Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b
 2015-05-21 03:04:11 +00: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
84caa25697 am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 
* commit 'b56a10368fa3b7f2a359c8cf4a7abf1ba7edf232':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
 2015-05-20 19:11:45 +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
8f4bf8677c am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 
* commit 'f675409e238bcd3df44fe0026a49e89cd30a5bdf':
  Address TODOs in WifiNoInternetDialog.
 2015-05-20 09:47:41 +00:00
Lorenzo Colitti
f675409e23 Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 2015-05-20 08:04:43 +00:00
The Android Automerger
7d348e5698 merge in mnc-release history after reset to mnc-dev 2015-05-20 01:04:36 -07:00
Maurice Lam
12bbde919b am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev 
* commit 'efbe46612d3253e683ec14cadabf638450b39486':
  [LockScreen] Update initial string in choose lock screens
 2015-05-20 01:50:50 +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
a7a7bfe59f Use DimmableIconPreference for Add user action 
Moved DimmableIconPreference from location to the root package since it is
now used in several places.

Add user action now uses DimmableIconPreference. Added a new summary string,
which is displayed when no more users can be added.

Bug: 20892920
Change-Id: I00b00f80ba8933a00a2de85777b9f7e55d03c31b
 2015-05-19 16:44:13 -07:00
Fyodor Kupolov
dc774b618b am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 
* commit 'c80084e55afeaeebfb0546c0112fb2e666e35700':
  Added SearchIndexProvider for UserSettings
 2015-05-19 21:47:04 +00:00
Fyodor Kupolov
c80084e55a Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 2015-05-19 21:44:17 +00:00
Jorim Jaggi
3099997b46 Fix string for fingerprint settings 
Also adjust fingerprint enrollment animation to spec.

Bug: 21030545
Change-Id: I937e4ea7ab4a51fa0b57b8b4c6b3038453d8f05e
 2015-05-19 14:10:05 -07:00
Jorim Jaggi
712530794b Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2) 
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
 2015-05-19 14:02:05 -07:00
Guang Zhu
9d9366004e Monkey should not be allowed to switch USB mode 
Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
 2015-05-19 12:19:19 -07:00
Jeff Sharkey
719d0ad904 am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev 
* commit 'd0393cd0417ecc8aed686578381745a88fb77f92':
  Warn user when adopted device is slow.
 2015-05-19 19:10:53 +00: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
Xiyuan Xia
0fa945f099 am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev 
* commit '3a310719d816b8608cd51469c62231a1ed41a608':
  No input instead of disabling password/pin entry
 2015-05-19 18:39:31 +00: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
b340980dee am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev 
* commit 'ccfbb1d6ca30dd495938a6e68ca02410e7ffb6c7':
  Monkey should not be allowed to switch USB mode
 2015-05-19 18:21:53 +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
e60c44a8e6 am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev 
* commit 'e74fdb8d672a361f5a29cded65278054e1683fc6':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 18:09:12 +00:00
Jason Monk
0a42a67d4e am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev 
* commit '2b7685224d1021a9e163a2ffc4bf4e8d38b56252':
  Default ignore optimizations to show system apps
 2015-05-19 18:09:11 +00:00