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

8552 Commits

Author SHA1 Message Date
ztenghui
cb791ec938 am 99b66dc7: am b1651d0e: am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit '99b66dc776ca624b30303b8a6405657aee834c25':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 17:14:31 +00:00
ztenghui
99b66dc776 am b1651d0e: am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit 'b1651d0e1f3d99bca8cec07f53258b05d169e618':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 17:02:40 +00:00
ztenghui
167a6bcdb7 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:05 +00:00
Jason Monk
2ccfdac69f am 28efc11e: am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev 
* commit '28efc11e2bfd94f4b5ba962201f99bbf946b7d27':
  Fix some dark theme issues (Take 2)
 2015-06-05 13:54:33 +00:00
Jason Monk
28efc11e2b am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev 
* commit 'f5a7d673fa1f5707f277e426f9c1e3ef33acee6e':
  Fix some dark theme issues (Take 2)
 2015-06-05 13:43:35 +00:00
Jason Monk
d7dbe16142 Merge "Fix some dark theme issues (Take 2)" into mnc-dev 2015-06-05 13:23:13 +00:00
Ye Wen
f5f51ae4ba am 0bc79df5: am 6d3e900c: am 1cb267ae: Enhance change default SMS app dialog to show list of apps 
* commit '0bc79df5efd859b6466dfcf031d5027b42a28b0d':
  Enhance change default SMS app dialog to show list of apps
 2015-06-05 00:47:33 +00:00
Ye Wen
0bc79df5ef am 6d3e900c: am 1cb267ae: Enhance change default SMS app dialog to show list of apps 
* commit '6d3e900c3dce4c6277505edb07c0a66f7a1d6bee':
  Enhance change default SMS app dialog to show list of apps
 2015-06-04 23:08:50 +00:00
Ye Wen
1cb267ae67 Enhance change default SMS app dialog to show list of apps 
Settings shows a dialog to android.provider.Telephony.ACTION_CHANGE_DEFAULT
intent to confirm if user wants to change default SMS app to a new one.
This is used by SMS apps to obtain default status. In the opposite direction,
i.e. giving up default status, SMS apps have to bring up the wireless
settings page where the default SMS app setting was originally located.
MNC moved this setting to a different location therefore broke the
function. This change enhances the SmsDefaultDialog to display a list of
SMS apps so that user can choose a different default SMS app, when the
new default SMS app package name is not specified within the above
intent.

b/20430567

Change-Id: I75d518900a7cf17f51b0d466bc2d062c470790bb
 2015-06-04 15:16:56 -07:00
ztenghui
4d1bec4730 Setup the animation callback for AnimatedVectorDrawable 
b/21341096

Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4
 2015-06-04 12:55:23 -07:00
Jason Monk
2d499533b7 Fix some dark theme issues (Take 2) 
Now with visible lock patterns! Both light and dark!

Bug: 21117509
Bug: 21077345
Bug: 21480587
Bug: 21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
 2015-06-04 14:16:10 -04:00
John Spurlock
11d500c9d1 am dec8f810: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit 'dec8f8107c13a0a6f0ff4e8d65139eb139a20850':
  Settings: Add zen rule name warning text.
 2015-06-04 16:16:16 +00:00
John Spurlock
dec8f8107c am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
  Settings: Add zen rule name warning text.
 2015-06-04 16:04:13 +00:00
Jason Monk
d2a7126de4 am 34bdee37: am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev 
* commit '34bdee377c74db609b60e2c650d9ce9dd29ca981':
  Fix updates of the enable/disable button
 2015-06-04 15:57:26 +00:00
Jason Monk
34bdee377c am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev 
* commit '06840b31f65e4972c24b7716b29831904d9ee694':
  Fix updates of the enable/disable button
 2015-06-04 15:44:35 +00:00
John Spurlock
1a1181edde Merge "Settings: Add zen rule name warning text." into mnc-dev 2015-06-04 15:41:58 +00:00
John Spurlock
7b4d1e2cb8 Settings: Add zen rule name warning text. 
Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
 2015-06-04 11:37:36 -04:00
Jason Monk
5dcedade3f am 74e687b8: am 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev 
* commit '74e687b8d1b3a5ad436774a2917338070947f86e':
  Fix crash in battery screen
 2015-06-04 15:33:28 +00:00
Jason Monk
cd5b97dfad Merge "Fix updates of the enable/disable button" into mnc-dev 2015-06-04 15:24:28 +00:00
John Spurlock
a0d91f6721 am cc8a3ee2: am c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev 
* commit 'cc8a3ee2fe2a30a123b1e8dc9200eeb203fef646':
  Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
 2015-06-04 15:21:33 +00:00
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
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
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
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
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
58148481a5 Merge "Protect against monkey crash" into mnc-dev 2015-06-04 12:56:17 +00: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
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
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
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
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
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
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
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