Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,620 Commits 3 Branches 0 Tags
ccf9c8376595ddbed64cedd236349cb99a2e8708
Commit Graph

552 Commits

Author SHA1 Message Date
Hyunyoung Song
63f0f5b312 Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev 
am: 2cbf71a0be

* commit '2cbf71a0be8abb646c5612e794cffa194edbdaf2':
  Add Shortcut API to Settings (1/2) b/28298258

Change-Id: I5ab2afdabae51375c01412855913c4e9c538b4b9
 2016-05-04 21:42:09 +00:00
Hyunyoung Song
be6c44823b Add Shortcut API to Settings (1/2) 
b/28298258

Initial CL to simply add first time shortcuts in the beginning.

Change-Id: Ib64e3cf1b17979da1548c168cd551ae125289132
 2016-05-04 18:51:30 +00:00
Tony Mak
012d7426c2 New settings key and policy transparency for managed profile settings 
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: Idac0d1357d77c4d740f3978f36e1e56224f66f0b
 2016-05-04 10:41:15 +00:00
Tony Mak
3c399a6855 New settings key and policy transparency for managed profile settings am: c820cc5fb1 
am: aded4dbf5e

* commit 'aded4dbf5e27abf6c9a0245dce56f4b2b2608a02':
  New settings key and policy transparency for managed profile settings

Change-Id: I826405bc11896d86b872b39d4222aa3319846f7f
 2016-05-04 09:52:52 +00:00
Tony Mak
aded4dbf5e New settings key and policy transparency for managed profile settings 
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: I5e5d30e39e1ba3c25a589fd6123f3a926b5745ba
 2016-05-04 09:47:33 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings 
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
 2016-05-04 09:33:08 +00:00
Baligh Uddin
da521ddc53 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I15a9ed4cab9b212c20a05b7fddcb00d74c3172bc
 2016-05-03 16:30:12 -07:00
Julia Reynolds
86d9329884 Merge "Announce access point changes." into nyc-dev am: 6af7c23168 
am: 4b9d15d4e2

* commit '4b9d15d4e2afb37aab911f73cc23a245b0f9f959':
  Announce access point changes.

Change-Id: I8c3b16f0a1e03a74719bf2bf102cd0c45a8f3dc9
 2016-05-03 19:09:46 +00:00
Julia Reynolds
4b9d15d4e2 Merge "Announce access point changes." into nyc-dev 
am: 6af7c23168

* commit '6af7c2316869d15989a2936fa399ec825979a221':
  Announce access point changes.

Change-Id: Ic9f144b311fcbdb143796f15f3812079b62e94c4
 2016-05-03 19:07:28 +00:00
Julia Reynolds
bc84c0fa67 Merge "Announce access point changes." into nyc-dev 
am: 6af7c23168

* commit '6af7c2316869d15989a2936fa399ec825979a221':
  Announce access point changes.

Change-Id: Ib8b2b6e2ef89650b85de7f401dd955df943bfd34
 2016-05-03 19:07:25 +00:00
Julia Reynolds
6af7c23168 Merge "Announce access point changes." into nyc-dev 2016-05-03 18:58:13 +00:00
Julia Reynolds
7ed62eb7a2 Announce access point changes. 
Bug: 24202851
Change-Id: I0de0d9bf89191750694a7ba2fac4a95babe62aeb
 2016-05-03 14:54:47 -04:00
Baligh Uddin
0934ef6671 Import translations. DO NOT MERGE 
Change-Id: I8033644a909eaa6136612cbffd309ffb6ca949a0
Auto-generated-cl: translation import
 2016-05-03 01:20:00 -07:00
Baligh Uddin
0a2893210d Import translations. DO NOT MERGE 
Change-Id: Ia0caec71caaacee083296ac8f093f2c046eaf2a4
Auto-generated-cl: translation import
 2016-05-03 01:16:24 -07:00
Clara Bayarri
dc2340ff2a Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev am: 88545ce446 
am: 9c3cebf729

* commit '9c3cebf7291a9e88d1bfb6815d5fec18e0125e68':
  Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it

Change-Id: I35f5cea0e26a5c8b59624d081b5ec41e836fefcb
 2016-04-29 16:48:08 +00:00
Clara Bayarri
7d47bd49e3 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev 
am: 88545ce446

* commit '88545ce4463939b90be1e5141b1dc3c1994fa35d':
  Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it

Change-Id: Ibe2b5baa27264ca95730f0d47d82825047b1b1df
 2016-04-29 16:45:32 +00:00
Clara Bayarri
9c3cebf729 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev 
am: 88545ce446

* commit '88545ce4463939b90be1e5141b1dc3c1994fa35d':
  Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it

Change-Id: I6738c82f8e390596b267782e5e8d872041b5c089
 2016-04-29 16:45:29 +00:00
Clara Bayarri
88545ce446 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev 2016-04-29 16:38:14 +00:00
Clara Bayarri
962694db38 Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it 
Bug: 28197210
Change-Id: I798a891b1de9777f652a46c1d938e23c0c62f783
 2016-04-29 16:56:02 +01:00
Lorenzo Colitti
5e64fb4e74 Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev am: a4daf16b57 
am: 52e5f2e5ec

* commit '52e5f2e5ec20cbda0f1ea05ae2294acb25950f44':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: I18f88810d4569ea79dd19a2a06f75caa177b557c
 2016-04-29 15:27:10 +00:00
Lorenzo Colitti
52e5f2e5ec Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev 
am: a4daf16b57

* commit 'a4daf16b578c456104f59f05ac374101426d1376':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: Ib9f1352386ebe667ec5d3d110f64e080c04c103d
 2016-04-29 15:24:42 +00:00
Lorenzo Colitti
c9733b0696 Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev 
am: a4daf16b57

* commit 'a4daf16b578c456104f59f05ac374101426d1376':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: I0dbba8203b58be5bd27557af9ef55aaac699cba9
 2016-04-29 15:24:39 +00:00
Lorenzo Colitti
fb628c078c The legacy DHCP client is gone. Delete the settings. 
Bug: 27192644
Change-Id: I5bc23f3e269e17d50fa2531a57fb0e2049ae18bf
 2016-04-29 22:19:23 +09:00
Bill Yi
b1ac51643c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-04-27 19:43:59 +00:00
Fan Zhang
9fc6480508 Merge "Make theme decoration method public." into nyc-mr1-dev 
am: 4ed77db

* commit '4ed77db35becf5da949d6af5ea5a0dfc0be3feb1':
  Make theme decoration method public.

Change-Id: If649316dfa5f2b48532c6e09148e5156626822a8
 2016-04-27 16:59:40 +00:00
Fan Zhang
4ed77db35b Merge "Make theme decoration method public." into nyc-mr1-dev 2016-04-27 16:53:01 +00:00
Bill Yi
68823d1c3c Import translations. DO NOT MERGE 
Change-Id: I5f8e0d3df0dfeb05c8315d0b17a861bee8096aaf
Auto-generated-cl: translation import
 2016-04-26 22:29:39 -07:00
Bill Yi
119fe56bc7 Import translations. DO NOT MERGE 
Change-Id: I462f55a9c48e4154ce97bbe76b2b8ef6add73086
Auto-generated-cl: translation import
 2016-04-26 22:23:19 -07:00
Bill Yi
6e2d20b2b6 Import translations. DO NOT MERGE 
Change-Id: I1811b4ca04bc4386f233bc1bdc2b486e6ce48b01
Auto-generated-cl: translation import
 2016-04-24 22:31:19 -07:00
Svetoslav Ganov
115ee8340f Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61 
am: 50d08f8

* commit '50d08f81d7c9e614f2a3f23fd815bbc183419874':
  Disallow disable of the system shared libs.

Change-Id: I689b99c36e7037ef4efbcbccea04be33e442c84e
 2016-04-22 21:09:55 +00:00
Svetoslav Ganov
599bf728de Merge "Disallow disable of the system shared libs." into nyc-dev 
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I111c0285b73ffa64594c39b54d18d5d3ff670953
 2016-04-22 21:07:11 +00:00
Svetoslav Ganov
50d08f81d7 Merge "Disallow disable of the system shared libs." into nyc-dev 
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I7edae9e8cbeefd4f20ffb2b708f68f6f04e79326
 2016-04-22 21:07:09 +00:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Fan Zhang
27904e913b Make theme decoration method public. 
Bug: 28141203

Change-Id: I0a51de3f9cafe8f562108f6e859c9e59f733d0ca
 2016-04-21 18:14:07 -07:00
Keith Cheung
87bd731e19 Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb59 
am: 5b935c170a

* commit '5b935c170a1a746ad33da3d2383913508998db56':
  Include work app in battery optimization settings

Change-Id: I437bafa953979a56314948b5d04e107317384aa3
 2016-04-21 15:33:49 +00:00
Keith Cheung
b21712eceb Merge "Include work app in battery optimization settings" into nyc-dev 
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82
 2016-04-21 15:31:46 +00:00
Keith Cheung
5b935c170a Merge "Include work app in battery optimization settings" into nyc-dev 
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: Ibd3aab6cde137ec145c43da3da2730dd62688d9f
 2016-04-21 15:31:17 +00:00
Keith Cheung
39066abb59 Merge "Include work app in battery optimization settings" into nyc-dev 2016-04-21 15:18:08 +00:00
Fan Zhang
242b4c6a31 Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev 
am: b6060a3

* commit 'b6060a3fbc9b1144aa515d17c67bb68eefb83893':
  Allow fragments set their own header view below actionbar.

Change-Id: I7958885f68dd6c1de54fb86fe6838ffcea6b6c45
 2016-04-20 21:17:30 +00:00
Mitchell Wills
115cb0b39e Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c am: de629c7 
am: ef2bf66

* commit 'ef2bf66598285bf8612f7fd0d9bf977fe2dcd14d':
  Update scan and last network info in the WorkThread

Change-Id: If2fe59775e0c2e8ea0592b1c561ef50346e382bf
 2016-04-20 21:15:41 +00:00
Sudheer Shanka
8fe7239c1c Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev am: df9ecfc 
am: ecbf20f

* commit 'ecbf20f31da3757ff9288880733256479aa778f4':
  Add restrictedSwitchSummary attribute to restricted switch preferences.

Change-Id: Ic85d6a9233e3abae92cac72a05d6527dfb0e7efe
 2016-04-20 21:13:18 +00:00
Mitchell Wills
dde619510c Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c 
am: de629c7

* commit 'de629c7ac77719ec6223254825a3e3b099c364c1':
  Update scan and last network info in the WorkThread

Change-Id: I37403f37ae66b4f8fef41f8b201d79a3e6f4bad9
 2016-04-20 21:13:04 +00:00
Sudheer Shanka
5f75618aed Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev am: 205d10b 
am: f6f61fc

* commit 'f6f61fc891cb0fcff904e5b9da250c59d8aa25a3':
  Fix additional summary of RestrictedSwitchPreference.

Change-Id: Icf194cff988090ce599ee49f8c6adf0b007d8572
 2016-04-20 21:12:32 +00:00
Sudheer Shanka
6aea4883c0 Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev 
am: df9ecfc

* commit 'df9ecfc587615edc80c6bf96e67d7dc4d510e03f':
  Add restrictedSwitchSummary attribute to restricted switch preferences.

Change-Id: I9a8a4ce042227278ea65bf51eed3d4e7125cd9f5
 2016-04-20 21:11:52 +00:00
Sudheer Shanka
fc6317db84 Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev 
am: 205d10b

* commit '205d10bb136e36a17662fb1e60b0e002ca1f7158':
  Fix additional summary of RestrictedSwitchPreference.

Change-Id: Ib337bc61f870aa7f76a506ea46bea53009dbf715
 2016-04-20 21:11:28 +00:00
Fan Zhang
b6060a3fbc Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev 2016-04-20 20:50:17 +00:00
Mitchell Wills
ef2bf66598 Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c 
am: de629c7

* commit 'de629c7ac77719ec6223254825a3e3b099c364c1':
  Update scan and last network info in the WorkThread

Change-Id: I9e783bd423ca88d4a4094c705b29b314d68f9e5e
 2016-04-20 19:04:40 +00:00
Mitchell Wills
de629c7ac7 Update scan and last network info in the WorkThread am: cf0875a am: c441faa 
am: 2dbac6c

* commit '2dbac6cee58c343682ebf6590ae170c2acd067e4':
  Update scan and last network info in the WorkThread

Change-Id: I1068111b96b907f9f3c839fc497e9d06e1254d26
 2016-04-20 19:01:51 +00:00
Mitchell Wills
2dbac6cee5 Update scan and last network info in the WorkThread am: cf0875a 
am: c441faa

* commit 'c441faa6de5618e9da029858ce83b3e129be2974':
  Update scan and last network info in the WorkThread

Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
 2016-04-20 18:57:29 +00:00
Mitchell Wills
c441faa6de Update scan and last network info in the WorkThread 
am: cf0875a

* commit 'cf0875a9b69da9da5e16563eca33609e775d9195':
  Update scan and last network info in the WorkThread

Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
 2016-04-20 18:53:58 +00:00