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

8004 Commits

Author SHA1 Message Date
Prem Kumar
531127a5c2 Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev 2014-12-29 13:23:51 +00:00
Sanket Padawe
d1724df602 am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev 
automerge: f128cff

* commit 'f128cff21ef7b8e2fa7721b481477ffecd9244ab':
  Fixed settings crash issue while recovering from phone crash.
 2014-12-28 05:31:57 +00:00
Sanket Padawe
9b1383a46d Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev 2014-12-23 03:35:23 +00:00
Sanket Padawe
79d5da7bf6 Fixed settings crash issue while recovering from phone crash. 
Bug: 18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
 2014-12-22 10:33:49 -08:00
PauloftheWest
876f6bbae8 am 68b93e68: am 1a5d132f: am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev 
* commit '68b93e68e2cb1f3d45391da8bbc3a6d46115a28c':
  Removed extraneous slot information on single SIM devices.
 2014-12-19 23:08:39 +00:00
PauloftheWest
68b93e68e2 am 1a5d132f: am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev 
* commit '1a5d132fcbf6a00c500fb7031a1f15e0328e7dcb':
  Removed extraneous slot information on single SIM devices.
 2014-12-19 23:03:11 +00:00
PauloftheWest
3e864c0bda Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev 2014-12-19 22:53:03 +00:00
Zoltan Szatmary-Ban
d7cadf3de2 Eliminate duplicated code for creating circled user icons in Settings. 
Use Utils.getUserIcon instead.

Change-Id: Id653f8c89ac041e925464c88bbc0c7c43d3ce632
 2014-12-19 15:23:16 +00:00
Zoltan Szatmary-Ban
53b4387719 Merge "Badge items in Settings > Apps > Running correctly" 2014-12-19 10:24:01 +00:00
Fyodor Kupolov
2c875e4537 Merge "Remove Users & profiles header for phones" 2014-12-19 01:47:13 +00:00
Sanket Padawe
cd5863c388 am ec3f7998: am eec0c11a: am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord. 
* commit 'ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 23:20:44 +00:00
Sanket Padawe
6d99a14a87 am 25f2cfe9: am 72cedc7a: am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev 
* commit '25f2cfe94ecc7d05c3c1a74c2e210fffcfc137e1':
  Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
 2014-12-18 23:20:18 +00:00
Sanket Padawe
87be2a6dd5 am 2497b44a: am cff282f3: am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev 
* commit '2497b44ab0dac4d16145f6e0cae5708354506955':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 23:20:16 +00:00
PauloftheWest
a68bdb6dbe Removed extraneous slot information on single SIM devices. 
Bug: 18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
 2014-12-18 15:02:39 -08:00
PauloftheWest
58f7eaf3d2 SIM Status now shows data connection instead of voice. 
Bug: 18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
 2014-12-18 13:59:04 -08:00
Sanket Padawe
ec3f7998db am eec0c11a: am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord. 
* commit 'eec0c11ae3386284dd6797076764572efeca52c3':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 18:43:55 +00:00
Sanket Padawe
19627ca215 Getting mcc/mnc from system prop instead of subInfoRecord. 
Bug: 18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
 2014-12-18 10:29:16 -08:00
Zoltan Szatmary-Ban
ae6ea36822 Remove frame and shadow from CircleFramedDrawable 
Also change the size the circled icon is drawn into to a 40dp by 40dp rect.

Bug: 18198624
Change-Id: I66d919a2f35ede614a90a423d2967a4c3bc18169
 2014-12-18 12:10:16 +00:00
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