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

20542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
cc6e9ae9c7 am 2821a373: am cf55da1e: am b2f11d01: String changes for app links in settings 
* commit '2821a373edf50b054e8a68565dbec5a3774dbb56':
  String changes for app links in settings
 2015-05-22 21:41:59 +00:00
Jason Monk
2821a373ed am cf55da1e: am b2f11d01: String changes for app links in settings 
* commit 'cf55da1ef517e63a6903e0730683d938cfbcf05c':
  String changes for app links in settings
 2015-05-22 19:11:52 +00:00
Jason Monk
cf55da1ef5 am b2f11d01: String changes for app links in settings 
* commit 'b2f11d013cc95ba9bebb62cdcbd06a3920872d24':
  String changes for app links in settings
 2015-05-22 18:51:34 +00:00
Jason Monk
b2f11d013c String changes for app links in settings 
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
 2015-05-22 14:42:45 -04:00
Stuart Scott
176f512c5a Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
 2015-05-22 10:19:53 -07:00
Jim Miller
cd2eb2e6c3 am e52c0152: am 549d5ec8: am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev 
* commit 'e52c0152f8a8982fe02ffd3d7e2f2f9969167721':
  Fix crash in fingerprint settings.
 2015-05-22 15:50:04 +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
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
Dave Langemak
0f5a085391 am 0d98b2b7: am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev 
* commit '0d98b2b7960be1a24937f80ff66ed5cad644e2f6':
  Banish Theme setting to developer options
 2015-05-22 00:24:09 +00: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
3aa73f6aa5 Merge "show correct backup status after dismissing are-you-sure dialog for turnning off backup" 2015-05-21 22:39:17 +00:00
Maurice Lam
ee127ed133 am 21deee07: am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 
* commit '21deee07ee972066aeb0daf6f636618df23364e8':
  [LockScreenSetup] Move retry button to top
 2015-05-21 22:33:32 +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
Sean Francis-Lyon
f833588dae show correct backup status after dismissing are-you-sure dialog for turnning off backup 
Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
 2015-05-21 15:21:12 -07:00
Jorim Jaggi
ee96ed2613 am 6cbad01c: am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev 
* commit '6cbad01c0b0cd145cc531b813e4541885148b457':
  Fix string for fingerprint settings
 2015-05-21 22:07:17 +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
b5d48a12d5 am 7c1453cd: am 837dfca0: am ce6f1651: Merge "Fix loading screen one more time" into mnc-dev 
* commit '7c1453cd2520d6f50fa9114eb47808ec17893b5c':
  Fix loading screen one more time
 2015-05-21 20:50:36 +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
116eafd323 am e383bc22: am 491a6b13: am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev 
* commit 'e383bc224810fa6e23ed8541011851df7f891d18':
  Do not show soft keyboard when locked out
 2015-05-21 18:59:03 +00:00
Jason Monk
34eb979fbd am 8289996d: am 939ee559: am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev 
* commit '8289996dfb6077322fc6914ba13a18cda11a92ee':
  Remove data item from app info when not supported
 2015-05-21 18:59:01 +00: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
f25b03a4f3 am 5fdab45f: (-s ours) am e008b99d: (-s ours) am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '5fdab45f4019b0b333b4ff96715f4a2ffbed1a6a':
  Import translations. DO NOT MERGE
 2015-05-21 15:52:28 +00:00
John Spurlock
8f58b0cb2f am cf12b49e: am 8b9dbbe0: am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev 
* commit 'cf12b49e51c29c1f01db376222d8bfb3b18701e2':
  Settings: Auto-capitalize edit text for zen autorule names.
 2015-05-21 15:52:27 +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
Geoff Mendal
111269eff7 Import translations. DO NOT MERGE 
Change-Id: Iccc7a50005ff72486028fc77cb04d51cc1474a13
Auto-generated-cl: translation import
 2015-05-21 07:12:14 -07: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
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