PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,508 Commits 1 Branch 0 Tags
6e9d64ba334555f0b83cf400fb0e8ac6dff9e1e8
Commit Graph

27508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
6e9d64ba33 Import translations. DO NOT MERGE am: ffe930ec76 -s ours 
am: 21b7e430e0  -s ours

* commit '21b7e430e0169d7b5a6f888c19ae37b1b503dec8':

Change-Id: I887f76c385a55621ba61f3621a81b86daea005b3
 2016-05-22 23:23:11 +00:00
Baligh Uddin
6744d9977e Import translations. DO NOT MERGE am: ffe930ec76 -s ours 
am: e973bb7182  -s ours

* commit 'e973bb718299b907a54b0a5d76dbafafa97fbdef':
  Import translations. DO NOT MERGE

Change-Id: I8840558f1983641822a42322fa157fff5d07a7b7
 2016-05-22 23:22:48 +00:00
Baligh Uddin
e973bb7182 Import translations. DO NOT MERGE 
am: ffe930ec76  -s ours

* commit 'ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c':
  Import translations. DO NOT MERGE

Change-Id: I7414492ad43d04da52e362c754b3e2d7d86486f1
 2016-05-22 23:20:36 +00:00
Baligh Uddin
21b7e430e0 Import translations. DO NOT MERGE 
am: ffe930ec76  -s ours

* commit 'ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c':
  Import translations. DO NOT MERGE

Change-Id: Ie71c67e0abd0b08ced8672cae96d4800337c6992
 2016-05-22 23:20:05 +00:00
Baligh Uddin
ffe930ec76 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
 2016-05-21 13:10:17 -07:00
Felipe Leme
0316e470d1 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e 
am: ec218b75ac

* commit 'ec218b75accb4ab4007b96076b4e8fd997798dec':

Change-Id: Ia0be1f58f0fb1b8e64fbf4bbafcfd69b9abb72e8
 2016-05-20 22:09:27 +00:00
Felipe Leme
1d6d3723ba Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e 
am: d21e63fe4b

* commit 'd21e63fe4b381354a2033bac1251f4152a7e14a3':
  Defined help page for Data Saver.

Change-Id: Ie8761cd677ee5a14a92ba52419d1ee21dfa1befa
 2016-05-20 22:08:22 +00:00
Felipe Leme
d21e63fe4b Merge "Defined help page for Data Saver." into nyc-dev 
am: f8265a8f1e

* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
  Defined help page for Data Saver.

Change-Id: I1430270ab4ac368a6909038ad90816ba67e1d664
 2016-05-20 22:06:06 +00:00
Felipe Leme
ec218b75ac Merge "Defined help page for Data Saver." into nyc-dev 
am: f8265a8f1e

* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
  Defined help page for Data Saver.

Change-Id: I8ee0281525ab7b606bec6262ac2b115cbe31ca2e
 2016-05-20 21:33:30 +00:00
Felipe Leme
f8265a8f1e Merge "Defined help page for Data Saver." into nyc-dev 2016-05-20 21:27:57 +00:00
Android Build Merger (Role)
0f8347312f Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: 00e73e75d5" into nyc-mr1-dev-plus-aosp 2016-05-20 18:28:32 +00:00
Jason Monk
39573c7cf2 Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 
am: 00e73e75d5

* commit '00e73e75d5092a99fd58b1e0b86a7b5d9c3cbcfb':
  Protect against monkey crash

Change-Id: Ib6d44bdf26d7ace8189c2d53b147b4749a3610c6
 2016-05-20 18:28:19 +00:00
Jason Monk
0d9fe2a14b Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 
am: cb0e0f9e30

* commit 'cb0e0f9e300785a74eaebde9b048861a5c66135f':
  Protect against monkey crash

Change-Id: I4f731e57db6563e92d64c873c71f5da1367fcf67
 2016-05-20 18:28:18 +00:00
Jason Monk
cb0e0f9e30 Merge "Protect against monkey crash" into nyc-dev 
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: I62f6f9968fe9826ee6045277e55773963d333c16
 2016-05-20 18:24:36 +00:00
Jason Monk
00e73e75d5 Merge "Protect against monkey crash" into nyc-dev 
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: Ie079d13887e9159d78ef5485bfa96878cee01d6a
 2016-05-20 18:24:35 +00:00
Jason Monk
d3ce331b94 Merge "Protect against monkey crash" into nyc-dev 2016-05-20 18:21:08 +00:00
Jason Monk
fd41b42487 Protect against monkey crash 
When rebuild comes in after context is no longer valid

Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes: 28875397
 2016-05-20 14:15:10 -04: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
Felipe Leme
cf2c0b1b97 Defined help page for Data Saver. 
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
 2016-05-20 09:08:28 -07: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
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
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
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
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