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

20741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
b1651d0e1f am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit '167a6bcdb74f9f47943a8f16b52e7d1b5ac35589':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 16:50:14 +00:00
ztenghui
167a6bcdb7 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:05 +00:00
Jason Monk
9344bf6232 am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev 
* commit '92f53c0223a84526b51d22d0799e55bc486d63c1':
  Settings > Apps list style updates
 2015-06-05 13:55:14 +00:00
Jason Monk
92f53c0223 am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev 
* commit '1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
  Settings > Apps list style updates
 2015-06-05 13:48:13 +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
1b93ef1d9b Merge "Settings > Apps list style updates" into mnc-dev 2015-06-05 13:36:27 +00:00
Jason Monk
f5a7d673fa am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev 
* commit 'd7dbe16142b0fc3faf448a81f3be13af7e95909f':
  Fix some dark theme issues (Take 2)
 2015-06-05 13:31:00 +00:00
Jason Monk
d7dbe16142 Merge "Fix some dark theme issues (Take 2)" into mnc-dev 2015-06-05 13:23:13 +00:00
Martijn Coenen
6d5cac5946 NFC: don't use dynamic resources. 
Also fixed talk-back for the default
payment app selection.

Bug: 21343778
Bug: 21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
 2015-06-05 11:36:50 +02:00
Jorim Jaggi
58c5fb38c7 Fix lockpattern weirdness 
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.

Bug: 21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0
 2015-06-04 18:00:34 -07:00
Maurice Lam
25e3081575 Update Setup Wizard redaction interstitial styles 
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.

Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
 2015-06-04 17:17:07 -07: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
6d3e900c3d am 1cb267ae: Enhance change default SMS app dialog to show list of apps 
* commit '1cb267ae67fdff22e2058eb3ee1e6b32994f24d6':
  Enhance change default SMS app dialog to show list of apps
 2015-06-04 22:45:02 +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
e103cb157b Settings > Apps list style updates 
Bug: 21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c
 2015-06-04 15:17:16 -04:00
Jason Monk
050785aff5 am 98aedcd6: am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev 
* commit '98aedcd64f7c180488c33ba6c2f96d22b0a92e96':
  Fix apps/memory screen's spinner alignment
 2015-06-04 19:13:24 +00:00
Tom O'Neill
01af0f21a9 Merge commit '1542f9c7' into manualmerge 
Change-Id: I6cb2a52ecb587bb3437ced58a404a2c028a185d9
 2015-06-04 11:52:58 -07:00
Jason Monk
98aedcd64f am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev 
* commit '0ad408e646fe6d8f75286a2838bf640d79fcf2ea':
  Fix apps/memory screen's spinner alignment
 2015-06-04 18:43:28 +00: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
Jason Monk
0ad408e646 Merge "Fix apps/memory screen's spinner alignment" into mnc-dev 2015-06-04 18:09:09 +00:00
Jason Monk
9ed8a0bc64 Fix apps/memory screen's spinner alignment 
Bug: 21587762
Change-Id: I80d7f2622330b02e63281aca8bd53261c0ad4d9b
 2015-06-04 13:54:06 -04:00
Jason Monk
888605debd am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev 
* commit 'f680c6919184cbe6750d64b3d0e7a4487514f9db':
  Fix dashboard shadows on tablets
 2015-06-04 16:43:08 +00:00
Tom O'Neill
1542f9c7d3 Merge "LocationSettings javadoc describes what's in the UI" 2015-06-04 16:28:21 +00:00
Jason Monk
f680c69191 am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev 
* commit '34784ec862d86e2f3b3b115e7c065b052b7bc888':
  Fix dashboard shadows on tablets
 2015-06-04 16:21:43 +00:00
Jason Monk
34784ec862 Merge "Fix dashboard shadows on tablets" into mnc-dev 2015-06-04 16:14:32 +00:00
Jason Monk
00dccfcbe8 Fix dashboard shadows on tablets 
Bug: 19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
 2015-06-04 12:04:30 -04: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
John Spurlock
afa64f45ab am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
  Settings: Add zen rule name warning text.
 2015-06-04 15:51:05 +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
06840b31f6 am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev 
* commit 'cd5b97dfad920ca5f84e42f3e0dbb648550637e6':
  Fix updates of the enable/disable button
 2015-06-04 15:33:07 +00:00
Jason Monk
cd5b97dfad Merge "Fix updates of the enable/disable button" into mnc-dev 2015-06-04 15:24:28 +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
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
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