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
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
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
Jason Monk
e103cb157b
Settings > Apps list style updates
...
Bug: 21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c
2015-06-04 15:17:16 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
04e1d51a64
am fb619a87
: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
...
* commit 'fb619a8726cf912e9c9156d8ca06760b641c5171':
Fix Wifi Signal strength icon issues in WifiSettings.
2015-06-03 19:09:08 +00:00
Sanket Padawe
fb619a8726
Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
2015-06-03 18:57:47 +00:00
Sanket Padawe
8cde7135b5
Fix Wifi Signal strength icon issues in WifiSettings.
...
Bug: 21591392
Bug: 21592509
Change-Id: I6612ef62c17e6279b06f80a67bee345e913f1927
2015-06-03 11:54:41 -07:00
Geoff Mendal
01145a1430
am 26e8b0bf
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '26e8b0bf7d62c0a9baed5c1b72b5c992d8209377':
Import translations. DO NOT MERGE
2015-06-03 18:32:09 +00:00