PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,726 Commits 1 Branch 0 Tags
59f5976e15699df713369564c92cda3941f74dce
Commit Graph

8036 Commits

Author SHA1 Message Date
Sanket Padawe
25f2cfe94e am 72cedc7a: am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev 
* commit '72cedc7af53483dea41eb391613b94b6f0a7226e':
  Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
 2014-12-18 06:38:28 +00:00
Sanket Padawe
4be06d9c48 Revert "Getting mcc/mnc from system prop instead of subInfoRecord." 
This reverts commit 579b66f28d.

Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
 2014-12-18 06:24:36 +00:00
Sanket Padawe
2497b44ab0 am cff282f3: am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev 
* commit 'cff282f3fc81c401a873cdf87ff399b8be28f90b':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 05:04:12 +00:00
Sanket Padawe
579b66f28d Getting mcc/mnc from system prop instead of subInfoRecord. 
Bug: 18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
 2014-12-17 19:31:30 -08:00
Fyodor Kupolov
5514509963 Remove Users & profiles header for phones 
In Settings/Users, remove "Users & profiles" header is no longer displayed
for phones. List of UserPreference is now explicitly sorted. Before, it
was relying on an overridden compareTo method in UserPreference, which
behavior was difficult to predict when instances of UserPreference were
mixed with other instances in the same group.

Bug:17630523
Change-Id: Iba1ef863c2cd4e8ca307ae0aa0877c5cd9e0973d
 2014-12-17 13:58:01 -08:00
Fyodor Kupolov
c7f09da972 Merge "Disable CryptKeeper activity for secondary users" 2014-12-17 21:22:11 +00:00
Alan Viverette
2097056679 Merge "Show a toast when filtering obscured touch input" 2014-12-17 00:54:12 +00:00
Alan Viverette
3c682c32a4 Show a toast when filtering obscured touch input 
We can't verify user consent if the touch input is obscured, so the
best we can do is fail with an informative message.

BUG: 18082299
Change-Id: I99bea51171d998c0e0ba58dd7bbf1167d4af925d
 2014-12-16 16:51:19 -08:00
Alexandra Gherghina
cf054c0b74 Merge "Make spinner icons circular" 2014-12-16 20:47:10 +00:00
Jason Monk
2e904fdd28 am c0ecaeef: am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 
* commit 'c0ecaeefe8d22c8dbd77c51090cb55e1c448b983':
  Add a periodic check of the tethering provisioning
 2014-12-16 17:11:29 +00:00
Jason Monk
c0ecaeefe8 am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 
* commit '5aaa4b63bd6ee0639ee067e3287e5d97b692a444':
  Add a periodic check of the tethering provisioning
 2014-12-16 17:05:14 +00:00
Jason Monk
b0c8c3935d Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 2014-12-16 15:44:27 +00:00
Sanket Padawe
506c13fd30 am ccb9fcfa: am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 
* commit 'ccb9fcfa1fa6d19e8d7ce60c592e4338d4a3575c':
  Prevent sim notify popup after upgrade from k to LMR1.
 2014-12-16 11:02:49 +00:00
Sanket Padawe
38f3eacf21 am 622fe174: am b92f3368: am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 
* commit '622fe17483874f98b0a2bba56bcc2bfea6f416cd':
  Exiting activity on clicking outside dialog acitivity.
 2014-12-16 11:02:45 +00:00
Sanket Padawe
ccb9fcfa1f am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 
* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
  Prevent sim notify popup after upgrade from k to LMR1.
 2014-12-16 03:00:41 +00:00
Sanket Padawe
622fe17483 am b92f3368: am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 
* commit 'b92f336886f34358f122ed101c082ccca7a44c79':
  Exiting activity on clicking outside dialog acitivity.
 2014-12-16 03:00:39 +00:00
Fyodor Kupolov
1b5cc427f0 Disable CryptKeeper activity for secondary users 
For secondary users, disable CryptKeeper activity in a broadcast receiver of
USER_INITIALIZE intent. This change has the following benefits for guest
user switching:
 - The code will be executed earlier in the user switching flow, when the
   screen is frozen by WindowManager.
 - Initialization of CryptKeeperActivity is skipped

Bug:18670536
Change-Id: I60300198b605c26ad15afe2c874d5f1be7da5087
 2014-12-16 02:48:36 +00:00
Sanket Padawe
7131f1a99c Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 2014-12-16 02:42:29 +00:00
Sanket Padawe
d059127659 Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 2014-12-16 02:42:17 +00:00
PauloftheWest
7dd0de5382 am 5200f61e: am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev automerge: 735e93e 
* commit '5200f61ede468ce782a0ae7a71df07ce948fb7f6':
  Fixed then icons of SIMs in the call dialog.
 2014-12-16 01:48:19 +00:00
PauloftheWest
5200f61ede am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 
automerge: 735e93e

* commit '735e93e52c59e13a27f24170c5e41ca22d5e4e6a':
  Fixed then icons of SIMs in the call dialog.
 2014-12-16 01:41:48 +00:00
Wink Saville
0bf96d604f am 6ac0cef0: am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit '6ac0cef01b655de3665e8750566fa10dac0e5697':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:47:01 +00:00
Stuart Scott
997a734faa am e84524ef: am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit 'e84524efc86517766797fd1614093c08dcb60b2c':
  Show toast when cellular data option is changing.
 2014-12-15 22:47:00 +00:00
PauloftheWest
c6f5c924d8 Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 2014-12-15 22:46:58 +00:00
Wink Saville
6ac0cef01b am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit '870a2a8ea85670dafdcd9d8617e0c99862f0604d':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:41:53 +00:00
Stuart Scott
e84524efc8 am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit '56db3f35eba2dae6463ac981822d8fe80fc6d189':
  Show toast when cellular data option is changing.
 2014-12-15 22:41:52 +00:00
PauloftheWest
7d46a4c9fe am d9396835: am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit 'd9396835770cbfa25c28a04e0f0bdcdf91d78a33':
  IMEI information will show without a SIM.
 2014-12-15 22:22:19 +00:00
PauloftheWest
d939683577 am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit '29db97d1189a885324d950ecb3a2e80d1eabaece':
  IMEI information will show without a SIM.
 2014-12-15 21:45:37 +00:00
Sanket Padawe
9b566a0924 Prevent sim notify popup after upgrade from k to LMR1. 
Bug: 18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
 2014-12-15 13:26:27 -08:00
Wink Saville
e04fd76f1c Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 2014-12-15 20:45:00 +00:00
Wink Saville
c47f8db374 Use getLIn1NumberForSubscriber to get phone number. 
Bug: 18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>
 2014-12-15 12:04:29 -08:00
Stuart Scott
b62bfe7155 Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 2014-12-15 19:43:19 +00:00
Lucky Zhang
e421f609eb am a6f6e5a3: am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit 'a6f6e5a35be333921f47d768d053054280552fa5':
  [FRP] Notification screen slides in wrong direction
 2014-12-15 18:46:24 +00:00
PauloftheWest
c8bcf2985a IMEI information will show without a SIM. 
Bug: 18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
 2014-12-15 10:29:54 -08:00
Narayan Kamath
62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp 
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
 2014-12-15 16:27:39 +00:00
Alexandra Gherghina
cee402a5f4 Make spinner icons circular 
Bug: 18311493
Change-Id: I73bd3951e2613254c1db3e8c0f2f1d174e1e4b6c
 2014-12-15 15:53:47 +00:00
Narayan Kamath
206d1d385c Merge "Stop using apache-http in settings." 2014-12-15 14:35:21 +00:00
Narayan Kamath
7a250b8288 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
 2014-12-15 14:32:38 +00:00
Zoltan Szatmary-Ban
903fa3f8eb Badge items in Settings > Apps > Running correctly 
That is, add a badge if the item belongs to a managed profile and
do not add if it belongs to the primary.

Bug: 18235061
Change-Id: Ice599b30cd2827180c21c8d0601af7f30b46e94b
 2014-12-15 14:28:39 +00:00
Zoltan Szatmary-Ban
2960b9392e Merge "Show removed user's data usage under its correct item" 2014-12-15 11:22:24 +00:00
Lucky Zhang
a6f6e5a35b am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit '03f336d07c055b6870dd18ab0096f9e5b085ff51':
  [FRP] Notification screen slides in wrong direction
 2014-12-13 00:29:43 +00:00
Lucky Zhang
5f17119f46 Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 2014-12-13 00:15:32 +00:00
John Spurlock
3d51b61f6c am 3eaa3506: am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit '3eaa35064a4e5a2eb1c57b465903e36774e27820':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 20:56:40 +00:00
PauloftheWest
a886d69f9d Fixed then icons of SIMs in the call dialog. 
Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
 2014-12-12 12:21:17 -08:00
John Spurlock
3eaa35064a am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 19:08:46 +00:00
Zoltan Szatmary-Ban
cd9b1507fb Show removed user's data usage under its correct item 
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
 2014-12-12 18:48:03 +00:00
John Spurlock
b4805e3a34 Settings: Allow more lines of saver feature description text. 
Bug: 18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
 2014-12-12 12:54:48 -05:00
Narayan Kamath
f25627c0c9 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
 2014-12-12 14:22:06 +00:00
Wink Saville
47a05fc45b am f5d6dd6a: am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: fc748fe 
* commit 'f5d6dd6a11ef0fd7518ba5905571c714e4b2df33':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:48:31 +00:00
Wink Saville
f5d6dd6a11 am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: fc748fe

* commit 'fc748fe9da449e427887c6d2381f9bd4462de56f':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:28 +00:00