PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,439 Commits 1 Branch 0 Tags
e289815ec02d30e9fe47197141efe141b68f6ba8
Commit Graph

7244 Commits

Author SHA1 Message Date
Paul Crowley
1abdd7c981 am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '7bd7823758fa88c295858466a0ffd5f5468a1452':
  Reduce number of attempts before factory reset to 30.
 2014-11-25 15:08:33 +00:00
Selim Cinek
51a36c6766 am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '2a65b1b105b6b1b0ea8f8b82df6833f2eadca5bd':
  Fixed build breakage due to api change.
 2014-11-25 15:08:14 +00:00
Zoltan Szatmary-Ban
7a2e5f1b03 am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '4a30d627a25f2e6cf3d699c4949919aae7ca7063':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-25 15:08:02 +00:00
Wink Saville
c1ded7e23f am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'fd0c6eb52326ae18d9b82c71b57c0cdef88344fd':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:05:59 +00:00
Lajos Molnar
8b2c19b578 am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer 
* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
  Reword NuPlayer developer settings to say AwesomePlayer
 2014-11-24 18:05:54 +00:00
Andres Morales
877e9de67b am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev 
* commit 'e6d4aba3e1686084833a09d1fcdabf91fc35b0b6':
  Update enable oem unlock warning
 2014-11-24 18:05:33 +00:00
Narayan Kamath
0d9fece9e8 am eb7795ed: Merge "Use shortFormat instead of shortFormat4." 
* commit 'eb7795ed31ee84c5569490b0949ea271865de7d8':
  Use shortFormat instead of shortFormat4.
 2014-11-24 16:07:21 +00:00
Paul Crowley
95a28c3f10 Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 2014-11-24 15:21:56 +00:00
Selim Cinek
44b50ad313 Merge "Fixed build breakage due to api change." into lmp-mr1-dev 2014-11-24 13:35:53 +00:00
Selim Cinek
334bd70fc7 Fixed build breakage due to api change. 
Bug: 16239208
Change-Id: I9c2b13d3687f9f61307e0c13b6940425faebfa9f
 2014-11-24 14:11:49 +01:00
Zoltan Szatmary-Ban
6ad8579262 Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 2014-11-24 12:08:02 +00:00
Wink Saville
239d185aa7 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:56 +00:00
Wink Saville
0183fb5394 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:11:39 -08:00
Lajos Molnar
c3245a0555 Reword NuPlayer developer settings to say AwesomePlayer 
Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c
 2014-11-21 21:51:29 -08:00
Andres Morales
7090c92f39 Merge "Update enable oem unlock warning" into lmp-mr1-dev 2014-11-22 03:28:45 +00:00
Andres Morales
26b46882cb Update enable oem unlock warning 
updating the strings from bug previously fixed

Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6
 2014-11-21 16:42:57 -08:00
Sanket Padawe
9209ce852a Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev 2014-11-21 23:34:31 +00:00
Zoltan Szatmary-Ban
5875aefa8a Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 2014-11-21 15:21:34 +00:00
Paul Crowley
13b8b564f8 Reduce number of attempts before factory reset to 30. 
Bug: 18292029

Change-Id: I2a78775d0505a3064838443ea631fee0ad612e5c
 2014-11-21 09:44:09 +00:00
Amith Yamasani
0cc764beed Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 2014-11-21 01:47:20 +00:00
Amith Yamasani
45f86236e4 Watch out for deleted user when exiting async task 
Fixes a problem where the async task can take a while to execute
and in the meantime the user can be removed. On exiting the async
task and updating the UI, make sure the user hasn't been deleted.

Bug: 18411181
Change-Id: I1831f3e53084c49e27557cb7aacec78c753a611b
 2014-11-20 13:19:18 -08:00
Wink Saville
b9b69faf5f Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:30:48 +00:00
Wink Saville
9aa0dd69c5 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
 2014-11-20 20:27:34 +00:00
Wink Saville
db2e05d89e Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:21:29 +00:00
Zoltan Szatmary-Ban
876a21bae8 Remove backup preferences if backup service is inactive 
Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
 2014-11-20 20:20:49 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Fyodor Kupolov
5925e1912e Merge "Added a check if a custom activity can be started" into lmp-mr1-dev 2014-11-19 22:20:25 +00:00
Sanket Padawe
79e44da1ba Changing sim selection dialog in Settings to use phoneAccount 
Changing sim selection dialog in Settings UI to select Call to display icons using
 phoneAccount.

Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb
 2014-11-19 18:45:27 +00:00
Wink Saville
1285f74fcb Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 10:34:28 -08:00
Fyodor Kupolov
07ab95c43e Added a check if a custom activity can be started 
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
 2014-11-18 17:12:54 -08:00
Zoltan Szatmary-Ban
cfe521e6e3 Stop background processes if TrustedCredentialSettings fragment gets detached 
Otherwise getActivity() returns null and other nasty null pointer dereferencings happen.

Bug: 17976307
Change-Id: If867785f991217267e0bf0ad3058a62177509852
 2014-11-18 18:02:48 +00:00
Narayan Kamath
ad53f0b936 Use shortFormat instead of shortFormat4. 
Won't make a difference since shortFormat4 is simply shortFormat
with the 'y' characters doubled.

bug: 18388178
Change-Id: I6177807430b295035092367553da5de3b942e2d6
 2014-11-18 15:17:44 +00:00
Alexandra Gherghina
3a84d40133 Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 2014-11-18 10:02:37 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI. 
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
 2014-11-17 10:43:37 -08:00
Elliott Hughes
02c4c517df Remove vestigial "Choose date format" option. 
Almost all of our date formatting goes via icu these days, so this is
a no-op almost everywhere. (And should be a no-op everywhere soon.)
There's no obvious way to fix it, so remove it. UI guidelines say we
should use spelled out month names anyway.

Bug: 18322220

(cherry picked from commit 30cc30864b)

Change-Id: I2a84d69a1f21f71d8bce5b69202b07f1b422aa57
 2014-11-17 10:43:20 -08:00
PauloftheWest
acb160baa3 Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 2014-11-17 16:12:44 +00:00
Paul Crowley
bf88566dc7 Merge "Force power cycle on cooldown." into lmp-mr1-dev 2014-11-17 13:29:50 +00:00
Alexandra Gherghina
2a3d649766 Fix NPE caused by status update outside activity lifecycle 
Bug: 18373656
Change-Id: I3c7db15df7c47b65a42a13fc7a3a077c3ad48f77
 2014-11-17 12:12:11 +00:00
Prem Kumar
b4e9a055bf Merge "Fix Sim Setting OOB error." into lmp-mr1-dev 2014-11-15 02:15:10 +00:00
Amith Yamasani
c395b9f37a Merge "Don't show SMS app settings for restricted profiles" into lmp-mr1-dev 2014-11-15 00:50:15 +00:00
Jeff Davidson
c01754bac9 Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 2014-11-15 00:17:03 +00:00
Jeff Davidson
ce32b21727 Final UX for Wi-Fi assistant platform settings. 
When one app is available, the toggle works as before. When multiple
apps are available, we allow the user to choose the app in a dialog
before turning on the setting.

Bug: 13780935
Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
 2014-11-14 15:27:21 -08:00
John Spurlock
fdebfc35c4 Settings: Add effects suppression text to Ring volume. 
If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.

Update volume pref design to optimize for this new custom appearance.

Depends on frameworks/base:
  Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5

Bug: 17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
 2014-11-14 14:38:03 -05:00
Jeff Sharkey
c88cdea2bb Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 2014-11-14 19:24:43 +00:00
Elliott Hughes
30cc30864b Remove vestigial "Choose date format" option. 
Almost all of our date formatting goes via icu these days, so this is
a no-op almost everywhere. (And should be a no-op everywhere soon.)
There's no obvious way to fix it, so remove it. UI guidelines say we
should use spelled out month names anyway.

Bug: 18322220
Change-Id: Ic9e903eceab3c096426f313bf4ef3a38644774e1
 2014-11-14 11:16:16 -08:00
PauloftheWest
1d891b4caa Added tabs for Multi-SIM SIM Lock. 
Bug: 18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
 2014-11-14 10:38:43 -08:00
PauloftheWest
0ee68facad Fix Sim Setting OOB error. 
+ Cleanup: deleted dead code.

Bug: 18380862
Change-Id: Ie5dc44c6c0fe50cd9243a19050b6d79732d2d014
 2014-11-14 10:18:07 -08:00
Jeff Sharkey
e16e44f756 Migrate license display to HTMLViewer. 
For security purposes, we're no longer allowing WebView to be loaded
when running as system UID.  Instead, we now launch HTMLViewer to
show the details.

Bug: 18376908
Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
 2014-11-14 09:46:33 -08:00