drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,155 Commits 1 Branch 0 Tags
Commit Graph

668 Commits

Author SHA1 Message Date
Torne (Richard Coles)
03d8b5b604 Merge "Change webview developer setting string." into nyc-dev am: bf150eeb75 am: afcfb64a96 
am: 57cf3a3073

* commit '57cf3a3073135630bd136bb572108e3b6aa89664':
  Change webview developer setting string.

Change-Id: I15508f2c61e097d2fb7f7f067953ea624720094f
 2016-05-11 16:29:22 +00:00
Torne (Richard Coles)
57cf3a3073 Merge "Change webview developer setting string." into nyc-dev am: bf150eeb75 
am: afcfb64a96

* commit 'afcfb64a967fb4c7d08967ecabf12b920abde568':
  Change webview developer setting string.

Change-Id: Ib7383ffe864d98a396f447a7b678227a16e7b29d
 2016-05-11 16:26:24 +00:00
Torne (Richard Coles)
afcfb64a96 Merge "Change webview developer setting string." into nyc-dev 
am: bf150eeb75

* commit 'bf150eeb752fd9126118c69411c4241e80718e87':
  Change webview developer setting string.

Change-Id: Iee8093dcf04859b1beb16455714672e697b939ec
 2016-05-11 16:23:12 +00:00
Torne (Richard Coles)
d3831179c8 Change webview developer setting string. 
Request from UI to change string to make it clearer.

Bug: 28691051
Change-Id: Ibc2507a0e278994741c43fdadccbbe3e416b2e49
 2016-05-11 15:52:07 +01:00
Svetoslav Ganov
d3aba29815 Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev am: 01da140ace am: eed1ea9541 
am: 81f888aeca

* commit '81f888aecaed67a21999c104adfd5bbdd66da646':
  Don't throw runtime exceptions for permission flags

Change-Id: I2e9404d4c50767cf5308bf585953e1a4327935cc
 2016-05-10 19:02:00 +00:00
Svetoslav Ganov
81f888aeca Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev am: 01da140ace 
am: eed1ea9541

* commit 'eed1ea95412baa2061669443cdd409b1cd62901f':
  Don't throw runtime exceptions for permission flags

Change-Id: I8c0b4730bf3473e99df3da28887280c928c0d453
 2016-05-10 18:59:01 +00:00
Svetoslav Ganov
eed1ea9541 Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev 
am: 01da140ace

* commit '01da140aced14162d6d1bf4a0b2bf33e23b9c2c4':
  Don't throw runtime exceptions for permission flags

Change-Id: I5add764e1665c24e54bc3d461ef0ad8ca6c880a0
 2016-05-10 18:56:11 +00:00
Svetoslav Ganov
7e01af4243 Don't throw runtime exceptions for permission flags 
We were thrwing undocumented runtime exception when
one gets the permission flags - now we just return
default result of the package is gone.

bug:28657926

Change-Id: I42554a86b9304ff83fe9385f3eea930b8ebf0c63
 2016-05-10 15:34:36 +00:00
Bill Yi
1c490a0e8b Import translations. DO NOT MERGE 
Change-Id: I513904878092ec474a6580c933beb79adf0f50ff
Auto-generated-cl: translation import
 2016-05-09 06:17:33 -07:00
Bill Yi
1d51db6ba8 Import translations. DO NOT MERGE 
Change-Id: Ia3e265610e5f562a0acfe849e2c7473f2bd44594
Auto-generated-cl: translation import
 2016-05-09 06:14:28 -07:00
Bill Yi
5dc000692e Import translations. DO NOT MERGE 
Change-Id: I73e72291d2f471c188bd63c5403e1e100b2fb5e7
Auto-generated-cl: translation import
 2016-05-09 05:04:35 -07:00
Bill Yi
32ef6fac2f Import translations. DO NOT MERGE 
Change-Id: I1d4745156fb9ddbff3d6af4564fa0a1754e1a384
Auto-generated-cl: translation import
 2016-05-05 21:30:57 -07:00
Bill Yi
3b4672d8ae Import translations. DO NOT MERGE 
Change-Id: I15055663e1705ae0e64ca3f4242bbad3748461e4
Auto-generated-cl: translation import
 2016-05-05 21:28:01 -07:00
Bill Yi
7202472fd4 Import translations. DO NOT MERGE 
Change-Id: If86ccee44cc4dffa5624abb081b6da94e0234071
Auto-generated-cl: translation import
 2016-05-05 20:26:14 -07:00
Hyunyoung Song
1c23149728 Merge "Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev am: 2cbf71a0be" into nyc-mr1-dev-plus-aosp 
am: 5ff313c9f8

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

Change-Id: Ifbb00ca50874d731319f6c34287f5440936b2586
 2016-05-04 22:08:22 +00:00
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
0cded9d39c New settings key and policy transparency for managed profile settings am: c820cc5fb1 am: aded4dbf5e 
am: 3c399a6855

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

Change-Id: I943f08261feae6673f48980f7c9ea9c9419c21d7
 2016-05-04 09:58:11 +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
c2adb228fd Merge "Announce access point changes." into nyc-dev am: 6af7c23168 am: 4b9d15d4e2 
am: 86d9329884

* commit '86d9329884d8073bca4657a453c384693faff8be':
  Announce access point changes.

Change-Id: If7c65ccf7d35ea79938b91a8b524756ad9987524
 2016-05-03 19:12:06 +00: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
Baligh Uddin
d555d86767 Import translations. DO NOT MERGE 
Change-Id: Ia3a61ee70bdcb91833443aed2cb52e9bc191ca52
Auto-generated-cl: translation import
 2016-05-03 00:00:45 -07:00
Clara Bayarri
109f6cb083 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev am: 88545ce446 am: 9c3cebf729 
am: dc2340ff2a

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

Change-Id: Ibb1b1deda5fd07d2234077e61cab0741cc999f92
 2016-04-29 16:50:59 +00: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
2ac6a535dc Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev am: a4daf16b57 am: 52e5f2e5ec 
am: 5e64fb4e74

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

Change-Id: I479f1c696fc1d7a325090e3bde265e85bc63eabd
 2016-04-29 15:29:38 +00: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
TreeHugger Robot
9053cbea0f Merge "Import translations. DO NOT MERGE" 2016-04-27 19:42:53 +00:00
The Android Automerger
8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115 2016-04-27 17:58:24 +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