PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,502 Commits 1 Branch 0 Tags
0abb9b7d69fb2e6cf60b1c9952893dba1bb9201c
Commit Graph

22502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
74e687b8d1 am 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev 
* commit '3cce5d3798f6140b40ac645d4bd8b66b3f960078':
  Fix crash in battery screen
 2015-06-04 15:21:04 +00:00
Jason Monk
3cce5d3798 am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev 
* commit 'bdf3ddadd51daef78434351d341954a0ae3fc56e':
  Fix crash in battery screen
 2015-06-04 15:09:08 +00:00
John Spurlock
cc8a3ee2fe am c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev 
* commit 'c72cfc8a97562999f9ed8292cedfd7132691cb1c':
  Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
 2015-06-04 15:08:27 +00:00
Jason Monk
bdf3ddadd5 Merge "Fix crash in battery screen" into mnc-dev 2015-06-04 14:58:57 +00:00
John Spurlock
c72cfc8a97 am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev 
* commit '34a78be5844f3e12fb6abccef12646d3c800fe7a':
  Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
 2015-06-04 14:58:01 +00:00
Jason Monk
63fbf68a42 Fix updates of the enable/disable button 
Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.

ApplicationsState could use some refactoring.

Bug: 21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4
 2015-06-04 10:57:31 -04:00
Jason Monk
6880ec09cd Fix crash in battery screen 
Also add a fake app item

Bug: 21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400
 2015-06-04 10:52:01 -04:00
John Spurlock
34a78be584 Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev 2015-06-04 14:48:02 +00:00
John Spurlock
c5bab237f5 Settings: Enable "ok" dialog button for no-op changes to existing zen rules. 
Bug: 21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76
 2015-06-04 10:44:45 -04:00
Jason Monk
3307c649c5 am fb8de829: am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev 
* commit 'fb8de829b51bf5168590a3a2a468578b5970106f':
  Disable owner info when no lock screen
 2015-06-04 13:45:31 +00:00
Jason Monk
e5791c7de0 am 2a3aeec3: am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev 
* commit '2a3aeec398d3d5ef900f68e2134eecb14bec0f1a':
  Protect against monkey crash
 2015-06-04 13:33:36 +00:00
Jason Monk
fb8de829b5 am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev 
* commit '1b53d0c25be74260dc654b481876a5e2d9ad18a8':
  Disable owner info when no lock screen
 2015-06-04 13:32:56 +00:00
Jason Monk
1b53d0c25b am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev 
* commit '41012d5e7b37fe5c2373f3215612d26331f40ba0':
  Disable owner info when no lock screen
 2015-06-04 13:20:27 +00:00
Jason Monk
2a3aeec398 am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev 
* commit '2ee08cd9623403948e8d88345426372f213e135d':
  Protect against monkey crash
 2015-06-04 13:19:49 +00:00
Jason Monk
41012d5e7b Merge "Disable owner info when no lock screen" into mnc-dev 2015-06-04 13:08:48 +00:00
Jason Monk
2ee08cd962 am 58148481: Merge "Protect against monkey crash" into mnc-dev 
* commit '58148481a53381cff75ed74421716690055a2f1d':
  Protect against monkey crash
 2015-06-04 13:07:02 +00:00
Jason Monk
58148481a5 Merge "Protect against monkey crash" into mnc-dev 2015-06-04 12:56:17 +00:00
The Android Automerger
7c4a0fed96 merge in mnc-release history after reset to mnc-dev 2015-06-04 01:05:02 -07:00
Jim Miller
e7f78bd17b am 1955fc5f: am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev 
* commit '1955fc5fb52d154017c52c069440824ec3d8d27e':
  Revert "Fix some dark theme issues"
 2015-06-04 03:22:08 +00:00
Jim Miller
1955fc5fb5 am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev 
* commit 'dddca46b581e0c40868242cb3952da8b409cc9c6':
  Revert "Fix some dark theme issues"
 2015-06-04 03:11:42 +00:00
Jim Miller
dddca46b58 am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev 
* commit '471da56938c2ca8102f7740b3eb5704f48d86aff':
  Revert "Fix some dark theme issues"
 2015-06-04 02:59:20 +00:00
Jim Miller
471da56938 Merge "Revert "Fix some dark theme issues"" into mnc-dev 2015-06-04 02:52:12 +00:00
Jim Miller
6433bd8f6a Revert "Fix some dark theme issues" 
This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.


This reverts commit cb8ccbb3b5.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
 2015-06-04 02:45:40 +00:00
Sanket Padawe
2545ec60a7 am af787a46: am ec3f6e29: am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev 
* commit 'af787a461ae85a1b1703bb2e6596f057b6e8431e':
  Display softKeyboard when entering pin for pairing BT device.
 2015-06-04 02:22:16 +00:00
Sanket Padawe
af787a461a am ec3f6e29: am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev 
* commit 'ec3f6e297c28b4a1b774b46a66fe969ebd30f0fa':
  Display softKeyboard when entering pin for pairing BT device.
 2015-06-04 02:12:48 +00:00
Sanket Padawe
ec3f6e297c am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev 
* commit '215e3f03766de0b72aed471d0b22c06e48ab03b2':
  Display softKeyboard when entering pin for pairing BT device.
 2015-06-04 01:58:07 +00:00
Sanket Padawe
215e3f0376 Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev 2015-06-04 01:47:50 +00:00
Sanket Padawe
9c4bdc038f Display softKeyboard when entering pin for pairing BT device. 
Bug: 18784238
Change-Id: I73bec83aa099a4f63fa055cb67afb095f37dee28
 2015-06-03 18:47:25 -07:00
Stuart Scott
9a8933ab5f am 9eb4d103: am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '9eb4d103450b3a6d2682f0ff8d5f8806518ae058':
  Re-add a string which was accidently removed.
 2015-06-04 01:28:13 +00:00
Stuart Scott
9eb4d10345 am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '01a6351f7afd4af10538a0b1cf4ed48cd2d7396a':
  Re-add a string which was accidently removed.
 2015-06-04 01:14:18 +00:00
Stuart Scott
01a6351f7a am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit 'fcf64237b72b506d6f45717d8f7252fb656c5fa4':
  Re-add a string which was accidently removed.
 2015-06-04 01:03:15 +00:00
Stuart Scott
fcf64237b7 Merge "Re-add a string which was accidently removed." into mnc-dev 2015-06-04 00:51:17 +00:00
Stuart Scott
1da842af41 Re-add a string which was accidently removed. 
bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
 2015-06-03 17:01:42 -07:00
Nicolas Prevot
decc1a79d1 am e7efc4b2: am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev 
* commit 'e7efc4b2a726cc2779211bc43c5fade83f08bf0c':
  In Settings, don't allow to disable an app which is profile/device owner.
 2015-06-03 22:51:18 +00:00
Nicolas Prevot
e7efc4b2a7 am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev 
* commit '91ec04bdce32f24056613f15041c905bf119c533':
  In Settings, don't allow to disable an app which is profile/device owner.
 2015-06-03 22:38:24 +00:00
Sanket Padawe
6eb55f64ad am 2613215a: am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling. 
* commit '2613215a6fdc683302fd6177ac10bd00736861c9':
  Fix Wifi Settings crash on continuous wifi toggling.
 2015-06-03 22:36:06 +00:00
Nicolas Prevot
91ec04bdce am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev 
* commit '41dbc14eda952203320bc9a64c3d42d98bacee9f':
  In Settings, don't allow to disable an app which is profile/device owner.
 2015-06-03 22:25:16 +00:00
Sanket Padawe
50376382df am 8b81d576: am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev 
* commit '8b81d576a7a63116bbcb51b3885df98ab4fe19c4':
  Fix Wifi Signal strength icon issues in WifiSettings.
 2015-06-03 22:23:27 +00:00
Geoff Mendal
988575c210 am 259ff225: (-s ours) am 01145a14: (-s ours) am 26e8b0bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '259ff22552ef15bbd9eff8f97c7f2bce37f026d4':
  Import translations. DO NOT MERGE
 2015-06-03 22:23:26 +00:00
Sanket Padawe
2613215a6f am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling. 
* commit 'ab0ea0a24f062485113de60c76a97a239ece6065':
  Fix Wifi Settings crash on continuous wifi toggling.
 2015-06-03 22:18:53 +00:00
Nicolas Prevot
41dbc14eda Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev 2015-06-03 22:17:11 +00:00
Sanket Padawe
ab0ea0a24f am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling. 
* commit '3d32af264254660150c5f2d63a64b3462a9378dd':
  Fix Wifi Settings crash on continuous wifi toggling.
 2015-06-03 22:06:01 +00:00
Nicolas Prevot
d0dfdda2f6 In Settings, don't allow to disable an app which is profile/device owner. 
In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.

BUG: 20831525

Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0
 2015-06-03 14:41:39 -07:00
Sanket Padawe
3d32af2642 Fix Wifi Settings crash on continuous wifi toggling. 
Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
 2015-06-03 14:16:13 -07:00
Jason Monk
0847796339 Disable owner info when no lock screen 
Bug: 20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e
 2015-06-03 16:37:07 -04:00
Jason Monk
28ca64b3d1 Protect against monkey crash 
Bug: 19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb
 2015-06-03 15:43:46 -04:00
Sanket Padawe
8b81d576a7 am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev 
* commit '04e1d51a6467ae41df6604423500e864e0ec7721':
  Fix Wifi Signal strength icon issues in WifiSettings.
 2015-06-03 19:24:11 +00:00
Jason Monk
53f7cddd94 am 48424d9d: am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev 
* commit '48424d9def5175cc03ca722bcd73bf7cf3267f9d':
  Fix some dark theme issues
 2015-06-03 19:23:47 +00:00
Nicolas Prevot
37622f29d8 am 058a428d: am ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev 
* commit '058a428dbc7b2e16d13a66f8eae47675e517ed50':
  Don't allow secondary users apps to start restricted Settings fragment.
 2015-06-03 19:23:45 +00:00
Jason Monk
ea0aa049ad am 174ed18d: am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev 
* commit '174ed18d90a827814c931e08772bbf408ec4033f':
  Reorder device category
 2015-06-03 19:23:44 +00:00