Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,746 Commits 1 Branch 0 Tags
ddc44490d6bbd26fbbe883804a93f5e88520591c
Commit Graph

12033 Commits

Author SHA1 Message Date
Jason Monk
30e2ab7a81 Merge "Fix leaks" into nyc-dev am: ea8ee68507 am: 639ed29bae 
am: f239345b0c

* commit 'f239345b0c4de4e40e31f762855737508a576075':
  Fix leaks

Change-Id: Ibc8d921ac97b303e76438d011f487fae97267624
 2016-05-03 19:48:43 +00:00
Jason Monk
f239345b0c Merge "Fix leaks" into nyc-dev am: ea8ee68507 
am: 639ed29bae

* commit '639ed29bae86891616643d00ffe143639e9cbb41':
  Fix leaks

Change-Id: Ib37a585ad37575abe7ef04f3c7d4b3024210738e
 2016-05-03 19:42:19 +00:00
Jason Monk
639ed29bae Merge "Fix leaks" into nyc-dev 
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: Ibf93ffeda0bca5e554da3462647ba207d0f9653f
 2016-05-03 19:39:59 +00:00
Jason Monk
ea8ee68507 Merge "Fix leaks" into nyc-dev 2016-05-03 19:36:34 +00:00
Jason Monk
4e8d3013a2 Fix leaks 
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes: 28074995
 2016-05-03 15:24:05 -04:00
Jason Monk
0d05f33739 Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: 508e93babd 
am: 22ac2b749a

* commit '22ac2b749a43bf61295571d20c3ecee7ca0d26d9':
  Try to fix receiver crash

Change-Id: I4304d0147a856ba6bd767836cb8588e146cf4c60
 2016-05-03 18:47:29 +00:00
Jason Monk
22ac2b749a Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 
am: 508e93babd

* commit '508e93babdab9cde97721670bbcd0fbc4a5a1e28':
  Try to fix receiver crash

Change-Id: I9f839090a913905358283f15a6930446209078c4
 2016-05-03 18:44:38 +00:00
Michael Wright
9d95f44205 Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: df824969af 
am: 8a2d933b58

* commit '8a2d933b58f60d7c295428c162057a09abe6e7de':
  Add subtext for default keyboard layout.

Change-Id: I7056e5bf83b5e3140df45c4d8b6b4b9cf0eedcc6
 2016-05-03 18:43:46 +00:00
Jason Monk
508e93babd Merge "Try to fix receiver crash" into nyc-dev 
am: 5a2d6800b6

* commit '5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
  Try to fix receiver crash

Change-Id: I641c41d7833bb8104f722889c123d1fe2447f6e7
 2016-05-03 18:42:05 +00:00
Jason Monk
5a2d6800b6 Merge "Try to fix receiver crash" into nyc-dev 2016-05-03 18:37:24 +00:00
Michael Wright
8a2d933b58 Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b 
am: df824969af

* commit 'df824969af786598f951830bd6ec387606da316a':
  Add subtext for default keyboard layout.

Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
 2016-05-03 18:36:48 +00:00
Michael Wright
df824969af Merge "Add subtext for default keyboard layout." into nyc-dev 
am: 12c2c2538b

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
  Add subtext for default keyboard layout.

Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9
 2016-05-03 18:34:18 +00:00
Michael Wright
12c2c2538b Merge "Add subtext for default keyboard layout." into nyc-dev 2016-05-03 18:28:59 +00:00
Michael Wright
276cc4d8ed Add subtext for default keyboard layout. 
Bug: 27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
 2016-05-03 18:27:16 +00:00
Jason Monk
a8a029f8eb Try to fix receiver crash 
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes: 28554650
 2016-05-03 14:25:56 -04:00
Philip P. Moltmann
be3718f2f8 Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: 0c71d3b5cf 
am: 6a2c269a4c

* commit '6a2c269a4c53e51ad72f96b8ecc64c91048e1acc':
  Read disk ID from intent

Change-Id: Id9c13a8dc72c11601d3309a28c4cd54a30494fff
 2016-05-02 23:35:46 +00:00
Philip P. Moltmann
6a2c269a4c Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 
am: 0c71d3b5cf

* commit '0c71d3b5cfbe14bb531ce3c94838ec84ef84d96b':
  Read disk ID from intent

Change-Id: I3854c5c6f17789e5bdfa16b5c4c7ff9ca635b4d1
 2016-05-02 23:29:43 +00:00
Philip P. Moltmann
0c71d3b5cf Merge "Read disk ID from intent" into nyc-dev 
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
 2016-05-02 23:24:05 +00:00
Philip P. Moltmann
e0e7fa4501 Merge "Read disk ID from intent" into nyc-dev 2016-05-02 23:00:30 +00:00
Sudheer Shanka
7f5cc819b7 Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a am: 0814dfbccb 
am: 1d7972ebaa

* commit '1d7972ebaa4c3fd468271b0df9a684a9c152bb21':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I6cf133d62a197efea479404b22a36acdaf440f16
 2016-05-02 20:22:59 +00:00
Sudheer Shanka
1d7972ebaa Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a 
am: 0814dfbccb

* commit '0814dfbccb5bff8a7cbf2c60d8b835d7207a3b45':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I315ecc2c7583ea17e56861a1b2b78b5bdf07a7e1
 2016-05-02 20:17:21 +00:00
Sudheer Shanka
0814dfbccb Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev 
am: 57e6a9144a

* commit '57e6a9144a0577308bd9888f3498c17ca96e4f5f':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I348e39f6519c3d620b7f3a3cba6eca72118339a9
 2016-05-02 20:09:59 +00:00
Sudheer Shanka
57e6a9144a Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev 2016-05-02 20:00:45 +00:00
Maurice Lam
2d33647a8a Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: 0f27a312b7 
am: 114ce05d7f

* commit '114ce05d7f2c487dccf0098440375e2865756c68':
  Remove top padding only if illustration is present

Change-Id: Ie16353f5d99034be57a070b07f8023c6382555cb
 2016-05-02 18:14:57 +00:00
Maurice Lam
114ce05d7f Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 
am: 0f27a312b7

* commit '0f27a312b7f8dd94443d8ccedc7e9e0debf49e3d':
  Remove top padding only if illustration is present

Change-Id: I88243769eecf9a4ba373bc48bd40cca4308c626a
 2016-05-02 18:10:09 +00:00
Maurice Lam
0f27a312b7 Merge "Remove top padding only if illustration is present" into nyc-dev 
am: 0e4816efb9

* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
  Remove top padding only if illustration is present

Change-Id: I0b92a87785df54ca66427a4e3871f0ed4737b55f
 2016-05-02 18:05:27 +00:00
Maurice Lam
0e4816efb9 Merge "Remove top padding only if illustration is present" into nyc-dev 2016-05-02 17:58:10 +00:00
Fan Zhang
c217ec8ef7 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev am: ac74071630 
am: e0fc6404a3

* commit 'e0fc6404a3b0d3858451f9e65efbf805fbc32740':
  Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4196227ac087bcadfec1a20f969edc7dba2016b5
 2016-05-02 17:09:39 +00:00
Fan Zhang
e0fc6404a3 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev 
am: ac74071630

* commit 'ac7407163096e3a743e95d452a1d9675d17734b9':
  Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4845a410b7c8a79d9f7e83e6216bb75044c4fae5
 2016-05-02 17:05:46 +00:00
Fan Zhang
ac74071630 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev 2016-05-02 16:57:12 +00:00
Fan Zhang
9502163f92 Explicitly setAccount in the same way as setHasInternet. 
Bug: 28141203

This frees adapter from updating account and internet internally, and
allows refreshData() be private.

Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee
 2016-05-02 09:24:59 -07:00
Adrian Roos
0f07c96c61 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: 3b8cc35b4a 
am: e7b9a582e7

* commit 'e7b9a582e7d13881ec39199b5a457bf467d8d99d':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I15eda9892b43b2d835c8a938ccdc7fc297b91a56
 2016-05-02 15:29:21 +00:00
Adrian Roos
e7b9a582e7 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: 3b8cc35b4a

* commit '3b8cc35b4ae79b6bbf0d7793b35df10f830d06f2':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I777028cb4d4b7120c538edc35928f1508743308f
 2016-05-02 15:25:12 +00:00
Adrian Roos
3b8cc35b4a Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 
am: 820d7c85c7

* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I1ce852a59674583c5dd2e67eeb79a4419ec15cda
 2016-05-02 15:21:02 +00:00
Adrian Roos
c14a9af008 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 
am: 820d7c85c7

* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
 2016-05-02 15:21:02 +00:00
Adrian Roos
820d7c85c7 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 2016-05-02 15:13:40 +00:00
Philip P. Moltmann
2fc2eb49a9 Read disk ID from intent 
mDisk might be null, but we can recover the disk ID from the original
Intent.

Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
 2016-04-29 16:35:28 -07:00
Maurice Lam
4d227268c6 Remove top padding only if illustration is present 
Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
 2016-04-29 15:07:40 -07:00
Adrian Roos
4bd42073d4 Properly handle rotation in NotificationLockscreenPreference 
There were some issues because we didn't explicitly
track and restore the selected position upon rotating,
so the fragment's oppinion of which item was selected
didn't match the ListView's.

Change-Id: Ia86e25dab36b44931297f8bcc7bcb7d6974f4b76
Fixes: 27921546
 2016-04-29 14:37:16 -07:00
Jason Monk
334de02262 Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: 4b32f9f5ad 
am: e8b198b606

* commit 'e8b198b606e318b2f9f3f98b7225299e53e28645':
  Don't crash on Settings data usage

Change-Id: I9aa40cdc9af7d65f8e02bb18be4464bb553a4c49
 2016-04-29 19:03:15 +00:00
Jason Monk
e8b198b606 Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af 
am: 4b32f9f5ad

* commit '4b32f9f5ada3f3eec32409c8188bb15e39bdea4b':
  Don't crash on Settings data usage

Change-Id: I9f345c6c8fd278c15ca1eb8453581cee6e553323
 2016-04-29 19:01:00 +00:00
Jason Monk
fc63188c2c Merge "Don\'t crash on Settings data usage" into nyc-dev 
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7
 2016-04-29 18:58:41 +00:00
Jason Monk
4b32f9f5ad Merge "Don\'t crash on Settings data usage" into nyc-dev 
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4
 2016-04-29 18:58:41 +00:00
Jason Monk
b60c7560af Merge "Don't crash on Settings data usage" into nyc-dev 2016-04-29 18:54:08 +00:00
Fan Zhang
dc5088bb9d Merge "Disable stable id in support adapter." into nyc-mr1-dev am: 7efc40797a 
am: bbe5bbb453

* commit 'bbe5bbb453fb5a2b297c46edd7c0461e6d2c5f6d':
  Disable stable id in support adapter.

Change-Id: I09d945cb62c273e64ae8c23bc4edcdb1228f1b8b
 2016-04-29 18:31:46 +00:00
Fan Zhang
bbe5bbb453 Merge "Disable stable id in support adapter." into nyc-mr1-dev 
am: 7efc40797a

* commit '7efc40797af03adc9b56e9f87acba4fa4d659940':
  Disable stable id in support adapter.

Change-Id: Ic7cb02dd709876b88e602aa0b37aaa5e8e0898e8
 2016-04-29 18:29:30 +00:00
Fan Zhang
7efc40797a Merge "Disable stable id in support adapter." into nyc-mr1-dev 2016-04-29 18:20:51 +00:00
Jason Monk
bc4e200a59 Don't crash on Settings data usage 
Consider Settings uid (SYSTEM_UID) to be an app.

Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076
 2016-04-29 14:06:10 -04:00
Jason Monk
e58559e3ca Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cd5d6137bc 
am: 1b997d2cd9

* commit '1b997d2cd966c7e7c73a37bc8343f60755dc30b2':
  Don't crash settings when out of space.

Change-Id: I4ed32a93c8d53e283af7c4884d2aae3876727801
 2016-04-29 18:02:15 +00:00
Jason Monk
1b997d2cd9 Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 
am: cd5d6137bc

* commit 'cd5d6137bc893f21928f6e77c70963780fc6e159':
  Don't crash settings when out of space.

Change-Id: I04e91645bb1e35b28ab1900d1f172d0633e2dc11
 2016-04-29 17:59:36 +00:00