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

20477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
549d5ec89e am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev 
* commit 'c499a5fe9d6632fa73104dcc88a9e2c2cd390dde':
  Fix crash in fingerprint settings.
 2015-05-22 01:50:13 +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
Jason Monk
fcb916b59c Remove data item from app info when not supported 
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
 2015-05-21 17:30:37 -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
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
21deee07ee am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 
* commit '03d12996462136ab8df91a76f4b8bf77cd53baef':
  [LockScreenSetup] Move retry button to top
 2015-05-21 22:22:07 +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
6cbad01c0b am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev 
* commit 'c8f78ec956ba6e59214926b3e442667575a6fc47':
  Fix string for fingerprint settings
 2015-05-21 21:40:20 +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
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
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
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
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
Geoff Mendal
5fdab45f40 am e008b99d: (-s ours) am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e008b99d447cad4bc59ae645f48a03b92d336f45':
  Import translations. DO NOT MERGE
 2015-05-21 15:39:22 +00:00
John Spurlock
cf12b49e51 am 8b9dbbe0: am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev 
* commit '8b9dbbe0c82a196b8f3d886db59b108f5becddeb':
  Settings: Auto-capitalize edit text for zen autorule names.
 2015-05-21 15:39:21 +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
Fyodor Kupolov
b7d361af0f am b995c78f: (-s ours) Merge "Added SearchIndexProvider for UserSettings" 
* commit 'b995c78fbbbab8060e5101fb1bee03adf509a786':
  Added SearchIndexProvider for UserSettings
 2015-05-21 00:28:46 +00:00
Fyodor Kupolov
b995c78fbb Merge "Added SearchIndexProvider for UserSettings" 2015-05-20 23:40:50 +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
Fyodor Kupolov
580e2e7ce1 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-20 14:23:52 -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
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
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
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
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
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