PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,414 Commits 1 Branch 0 Tags
4a38f28c19748c25643b225c7f1c52a498faf98c
Commit Graph

28414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
4a38f28c19 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 2c04e72414 
am: e8653d4dd2

* commit 'e8653d4dd2aae4a5cc1ac572c02090ed738c8c26':

Change-Id: I8c2c3148d64c1c94a5ccdeed1c83be08c0f7c5ef
 2016-05-20 17:48:35 +00:00
Victor Chang
9b94f36138 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 4e47a17a62 
am: a92877f63c

* commit 'a92877f63c5e2d8f88338027969e505903a9554c':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: Iaf117fa1267317771b77040edd8f409bdf8409b1
 2016-05-20 17:48:34 +00:00
Victor Chang
e8653d4dd2 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 
am: 2c04e72414

* commit '2c04e724148556aacbb3956b39af04a16e2a385e':

Change-Id: Ia833572871a8dcd6b89465bd7117354fa8f8f7b3
 2016-05-20 17:41:22 +00:00
Victor Chang
a92877f63c Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 
am: 4e47a17a62

* commit '4e47a17a625e3d275bd6e8d6884aee6564875ed8':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: Ie5fa3d38a976009242964f0c784b2760e7ffef7e
 2016-05-20 17:39:57 +00:00
Victor Chang
4e47a17a62 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 
am: 99a88eca78

* commit '99a88eca7840af3cee8ab13a82c12e3217ea6120':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: I77209cdef4dc285e36d3c632acc3fa6cd9ee1bbf
 2016-05-20 17:34:08 +00:00
Victor Chang
2c04e72414 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 
am: 99a88eca78

* commit '99a88eca7840af3cee8ab13a82c12e3217ea6120':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: I9106b6bee11927b909fcfbc417941d0cead07691
 2016-05-20 17:30:38 +00:00
Victor Chang
99a88eca78 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 2016-05-20 17:19:42 +00:00
Victor Chang
00859bd548 Temp fix for NPE when race condition happens in TrustedCredentialsSettings 
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
 2016-05-20 17:19:29 +00:00
Jason Monk
33816a83c1 Merge "Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: a9dc3a8826" into nyc-mr1-dev-plus-aosp 
am: 7796e8f7cd

* commit '7796e8f7cdae827cbcb6899a2a3cf513c99d6266':

Change-Id: I2f71094a59503db85b87e2a68107ba9bc004dfc0
 2016-05-20 15:15:57 +00:00
Jason Monk
bb160f5de2 Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: fb71469253 
am: f86de9078a

* commit 'f86de9078a91f8ed16265ddfaf7a55a61b9778ed':
  Don't use ApplicationsState for summaries

Change-Id: I89d00fa3fd2e25c448f7c341f3e559eb473377a0
 2016-05-20 15:15:55 +00:00
Android Build Merger (Role)
7796e8f7cd Merge "Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: a9dc3a8826" into nyc-mr1-dev-plus-aosp 2016-05-20 15:13:20 +00:00
Jason Monk
f86de9078a Don\'t use ApplicationsState for summaries am: 290ca6ec5c 
am: fb71469253

* commit 'fb71469253a64d7da163181b46cdb7639da778e9':
  Don't use ApplicationsState for summaries

Change-Id: Ia28528ad388e7732442f4572e13e36cf1f20db9e
 2016-05-20 15:13:08 +00:00
Jason Monk
a9d7ea4c15 Don\'t use ApplicationsState for summaries am: 290ca6ec5c 
am: a9dc3a8826

* commit 'a9dc3a8826ad709c526f208a464e15dc208e4c94':
  Don't use ApplicationsState for summaries

Change-Id: Ie71c994f87f811554adadccd6518e44945d35086
 2016-05-20 15:13:08 +00:00
Jason Monk
a9dc3a8826 Don\'t use ApplicationsState for summaries 
am: 290ca6ec5c

* commit '290ca6ec5c1f029bff7a43d1d499359e25a41904':
  Don't use ApplicationsState for summaries

Change-Id: I0a458fd54256315333eb5c6bcef809e2b2381a5a
 2016-05-20 15:10:20 +00:00
Jason Monk
fb71469253 Don\'t use ApplicationsState for summaries 
am: 290ca6ec5c

* commit '290ca6ec5c1f029bff7a43d1d499359e25a41904':
  Don't use ApplicationsState for summaries

Change-Id: I09f949a2606e30c9e56d7c9026c3fa306cfa506a
 2016-05-20 15:10:20 +00:00
Jason Monk
290ca6ec5c Don't use ApplicationsState for summaries 
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.

Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes: 28435146
 2016-05-20 09:37:53 -04:00
Daniel Nishi
bbbdf1fa24 Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev am: ab5a648ddb 
am: d7c52d9a99

* commit 'd7c52d9a992fe799cc2206a6a829d4ab57f77f84':
  Add a collapsible checkbox preference for deletion helper.

Change-Id: I63632673593f3f64d53e44425f94d6accec99127
 2016-05-20 00:16:36 +00:00
Fan Zhang
f579cf9ae1 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev am: de188186d8 
am: 9821904876

* commit '98219048769789a7904c840bf32806cf70f0d56f':
  Display disclaimer dialog before starting support.

Change-Id: Ia973f79f522c627ec2e126a42392d00e5d0e371d
 2016-05-20 00:16:29 +00:00
Sanket Agarwal
243f846fc1 Merge "Handle return value when Bluetooth is enabled am: 77ad3c2531 am: 2463057c6c" into nyc-mr1-dev-plus-aosp 
am: fde0e5d319

* commit 'fde0e5d319c15a1cc361b2ad58a8cd7dd1a31688':

Change-Id: Ib92ea80afff1425ccc23ec1a46bf5a539485070f
 2016-05-20 00:15:57 +00:00
Daniel Nishi
d7c52d9a99 Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev 
am: ab5a648ddb

* commit 'ab5a648ddb3e86d16cc6f170407e4b299a7594d5':
  Add a collapsible checkbox preference for deletion helper.

Change-Id: Iea651abe1ee6b48017effc23fe63aa3c0593a455
 2016-05-19 21:29:28 +00:00
Daniel Nishi
ab5a648ddb Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev 2016-05-19 21:19:02 +00:00
Daniel Nishi
fda4b4625b Merge "Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev am: e6d02b6c5e" into nyc-mr1-dev-plus-aosp 
am: 71069ded1b

* commit '71069ded1bb7a4a1b8fdb6d4457ece76a930b88d':
  Update the deletion helper feature factory for photos and videos.

Change-Id: I0cb8ae3f139ef7a7746d119f8e8c0b16b9277035
 2016-05-19 21:07:39 +00:00
Sanket Agarwal
261543c89b Handle return value when Bluetooth is enabled am: 77ad3c2531 am: 63ddec0756 
am: 3c2bd1a442

* commit '3c2bd1a44238c5844b4ec06018857f9dcb0cc7f2':
  Handle return value when Bluetooth is enabled

Change-Id: Ibbba45ce3ea8401e2eeec75369e18047091b7044
 2016-05-19 21:05:58 +00:00
Fan Zhang
9821904876 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev 
am: de188186d8

* commit 'de188186d877b178c82c7f6e6d674e13d99ccdfa':
  Display disclaimer dialog before starting support.

Change-Id: Ic5e6246e312d66ea178aec8986e5e293d49b08c6
 2016-05-19 20:45:14 +00:00
TreeHugger Robot
de188186d8 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev 2016-05-19 20:41:18 +00:00
Fan Zhang
a2bd32b397 Display disclaimer dialog before starting support. 
Bug: 28656426
Bug: 28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
 2016-05-19 12:15:38 -07:00
Android Build Merger (Role)
fde0e5d319 Merge "Handle return value when Bluetooth is enabled am: 77ad3c2531 am: 2463057c6c" into nyc-mr1-dev-plus-aosp 2016-05-19 18:39:57 +00:00
Android Build Merger (Role)
71069ded1b Merge "Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev am: e6d02b6c5e" into nyc-mr1-dev-plus-aosp 2016-05-19 18:39:46 +00:00
Sanket Agarwal
46bb0dcf30 Handle return value when Bluetooth is enabled am: 77ad3c2531 
am: 2463057c6c

* commit '2463057c6c31eb388fde6c7a44312d54ff17b1d6':
  Handle return value when Bluetooth is enabled

Change-Id: I35635b0fa270ebf0c0847cc2014d7711b3eff560
 2016-05-19 18:37:50 +00:00
Sanket Agarwal
3c2bd1a442 Handle return value when Bluetooth is enabled am: 77ad3c2531 
am: 63ddec0756

* commit '63ddec075623cbe9d6a09dec75c3be205fa56d81':
  Handle return value when Bluetooth is enabled

Change-Id: I712a01b1931400e92bc692d2730e22160bdb296d
 2016-05-19 18:37:02 +00:00
Daniel Nishi
a0a580c290 Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev 
am: e6d02b6c5e

* commit 'e6d02b6c5e2367418b0284e60b99f94852c153e0':
  Update the deletion helper feature factory for photos and videos.

Change-Id: Ib0f1c206be1b5b7ad1e28bd0e0f9683e1f24ba2c
 2016-05-19 18:34:17 +00:00
Sanket Agarwal
2463057c6c Handle return value when Bluetooth is enabled 
am: 77ad3c2531

* commit '77ad3c2531c00c7b654162be826e93abb5e4dc75':
  Handle return value when Bluetooth is enabled

Change-Id: I65d2d0b20ed3474f0c8b40a5cd17d12c00283c15
 2016-05-19 18:32:29 +00:00
Sanket Agarwal
63ddec0756 Handle return value when Bluetooth is enabled 
am: 77ad3c2531

* commit '77ad3c2531c00c7b654162be826e93abb5e4dc75':
  Handle return value when Bluetooth is enabled

Change-Id: I5db74292d85d6a8795b2b25afd3c89c3731bd533
 2016-05-19 18:32:25 +00:00
Sanket Agarwal
77ad3c2531 Handle return value when Bluetooth is enabled 
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.

Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
 2016-05-19 18:27:03 +00:00
Daniel Nishi
e6d02b6c5e Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev 2016-05-19 18:26:43 +00:00
Daniel Nishi
4019400fb5 Merge "Don\'t show app in deletion helper if it was installed recently." into nyc-mr1-dev am: 0772471119 
am: b09ecc6b8f

* commit 'b09ecc6b8fba4800cf4f1e819b063986245a121a':
  Don't show app in deletion helper if it was installed recently.

Change-Id: I73924851d445159a521d35d50a398f30754d518b
 2016-05-19 17:17:53 +00:00
Daniel Nishi
b09ecc6b8f Merge "Don\'t show app in deletion helper if it was installed recently." into nyc-mr1-dev 
am: 0772471119

* commit '07724711199a78720f4b1d9bdf365633e085b333':
  Don't show app in deletion helper if it was installed recently.

Change-Id: I442adc220e730aca333eb49041cd2955a8f2e106
 2016-05-19 17:13:34 +00:00
Daniel Nishi
a779cd2b16 Add a collapsible checkbox preference for deletion helper. 
This adds a custom preference group which has both a checkbox
and collapse/expand behavior. This is intended to be used in
the deletion helper for apps deletion and downloads folder
deletion.

This patch implements the apps deletion integration.

Bug: 28769691
Change-Id: I9fb28a1baa4067841742b5dbeaf2083728c16144
 2016-05-19 10:12:59 -07:00
Daniel Nishi
0772471119 Merge "Don't show app in deletion helper if it was installed recently." into nyc-mr1-dev 2016-05-19 17:09:17 +00:00
Daniel Nishi
76cd0118e9 Update the deletion helper feature factory for photos and videos. 
Bug: 28554187

Change-Id: I7fcc34af87ec17e9396f390d851fd31df1dc951a
 2016-05-19 10:05:59 -07:00
Daniel Nishi
7ad6c44b15 Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev am: 83ff4b06ec 
am: d85a19a970

* commit 'd85a19a97043eb7c22fee797655cc5cf55022af0':
  Add an upsell dialog to activate the storage manager.

Change-Id: I25138268bf7f256f2c4d52b8f083e6e66d721d28
 2016-05-19 17:05:15 +00:00
Daniel Nishi
d85a19a970 Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev 
am: 83ff4b06ec

* commit '83ff4b06ecae86cbfed75938df793628723c076c':
  Add an upsell dialog to activate the storage manager.

Change-Id: I0ac4d60411b135db3d3f876f4bec98c2663adf4c
 2016-05-19 17:01:27 +00:00
Daniel Nishi
83ff4b06ec Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev 2016-05-19 16:47:51 +00:00
Kenny Guy
86dbfc792a Merge "Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 am: cdc59c8709" into nyc-mr1-dev-plus-aosp 
am: 5e01c6c2f6

* commit '5e01c6c2f6508b7a167ccc0f900b0938830488a5':

Change-Id: I99429f53fdae516733de5460ec8d192717c242fc
 2016-05-19 11:14:38 +00:00
Kenny Guy
6468225b40 Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 am: 01891c5bf0 
am: 8da57a60f8

* commit '8da57a60f8e1a61a2e835fb95fd2049a12021a6d':
  Update work challenge background image.

Change-Id: Ie1f18ff1c0eaee38362b1432fc26698ecca79ce3
 2016-05-19 11:14:37 +00:00
Android Build Merger (Role)
5e01c6c2f6 Merge "Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 am: cdc59c8709" into nyc-mr1-dev-plus-aosp 2016-05-19 11:11:22 +00:00
Kenny Guy
a848b1048f Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 
am: cdc59c8709

* commit 'cdc59c87090f16afbc4336062ce371317b2def0b':
  Update work challenge background image.

Change-Id: I266f8e0be6ddf4135bf0a11694210a1639df2762
 2016-05-19 11:11:10 +00:00
Kenny Guy
8da57a60f8 Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 
am: 01891c5bf0

* commit '01891c5bf07db8df50bac4b3f21744187815557e':
  Update work challenge background image.

Change-Id: I7f41624bd0918f9127c934cfaf15e8762be35c0a
 2016-05-19 11:11:08 +00:00
Kenny Guy
01891c5bf0 Merge "Update work challenge background image." into nyc-dev 
am: 726085c5c7

* commit '726085c5c7016a828850580a21e09d2330a20ce4':
  Update work challenge background image.

Change-Id: Iadf215b82f1753c88471acad41ff70fe3242e65a
 2016-05-19 11:07:59 +00:00
Kenny Guy
cdc59c8709 Merge "Update work challenge background image." into nyc-dev 
am: 726085c5c7

* commit '726085c5c7016a828850580a21e09d2330a20ce4':
  Update work challenge background image.

Change-Id: Ie16ea20b5c848814d9bd48b1c704f6a3cc73d35c
 2016-05-19 11:07:59 +00:00