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

315442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
23cbbe1c73 Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp 
am: a7e30062c9

Change-Id: I6500639ae839ee9ad5af34d1292d1539c943e2ad
 2017-04-12 23:45:57 +00:00
Jiaquan He
ffdbb07c91 Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev am: 18d993bb72 
am: 7ed2b1adeb

Change-Id: Ie92d455fdc43e627ef436191f8d72737b68c4d96
 2017-04-12 23:39:41 +00:00
Jiaquan He
caaba8c2b8 Draw a default focus highlight if needed. am: 8062949ece 
am: d415eac183  -s ours

Change-Id: I847beeafcdf68ce8228574e754bfd722ec89e0b8
 2017-04-12 23:38:12 +00:00
Jiaquan He
66da966c6b Add a public API defaultFocusHighlightEnabled. am: b7daaf8b5f 
am: 557922d37a

Change-Id: I84f82f570dbd32769c82be426bbbc184cc1f53ac
 2017-04-12 23:36:40 +00:00
Jiaquan He
bf084b1dc6 Detect unhandled keyboard focused state. am: 4a81674b45 
am: 4bd8bce6d7

Change-Id: I506ff2c909aa98f049d2f663a6cf714e3e06e6d6
 2017-04-12 23:35:40 +00:00
Android Build Merger (Role)
a7e30062c9 Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp 2017-04-12 23:00:13 +00:00
Lorenzo Colitti
c34f0f7520 Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 
am: cfd729093f

Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b
 2017-04-12 22:58:42 +00:00
Jiaquan He
7ed2b1adeb Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev 
am: 18d993bb72

Change-Id: Ic8d6df348c0c3908e32ae8dc288ee48b5a731163
 2017-04-12 22:56:15 +00:00
Jiaquan He
d415eac183 Draw a default focus highlight if needed. 
am: 8062949ece

Change-Id: Ia06126f29168df05fe851746d86e15846ceca1b8
 2017-04-12 22:54:17 +00:00
Jiaquan He
557922d37a Add a public API defaultFocusHighlightEnabled. 
am: b7daaf8b5f

Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e
 2017-04-12 22:53:09 +00:00
Jiaquan He
4bd8bce6d7 Detect unhandled keyboard focused state. 
am: 4a81674b45

Change-Id: I8c756acc96cab2d24c19f86c50266c2ef51b5494
 2017-04-12 22:51:56 +00:00
Tony Mak
e682acb20b Merge "clear calling identity before calling settings provider" into oc-dev am: c240c9b134 
am: a06e779bfe

Change-Id: Ie2baee0eb27b8c593227dc99e1191a5a44b4c500
 2017-04-12 22:51:35 +00:00
Lorenzo Colitti
cfd729093f Merge changes from topic 'network_specifier' am: d0f476bdae 
am: 362bef45d1

Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918
 2017-04-12 22:48:55 +00:00
Lorenzo Colitti
362bef45d1 Merge changes from topic 'network_specifier' 
am: d0f476bdae

Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1
 2017-04-12 22:43:03 +00:00
TreeHugger Robot
18d993bb72 Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev 
* changes:
  Fix broken CTS tests.
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.
 2017-04-12 22:40:15 +00:00
Amit Mahajan
aae7707efb Merge "Add p2 option in openLogicalChannel." into oc-dev am: 682ce66309 
am: 1c29bdda34

Change-Id: I31176c61432ed9efb999991745fc635b734e66ee
 2017-04-12 22:30:39 +00:00
Jakub Pawlowski
19d6662777 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b am: ce8de6c3f7 
am: 2ef7bb7b06

Change-Id: Id53332e5bfbd22690992b0d010a24d3601c03092
 2017-04-12 22:29:26 +00:00
Dianne Hackborn
e995eb60ba Merge "Allow appops command to modify uid ops." into oc-dev am: 81bfe1f62e 
am: 59c6507670

Change-Id: Iae5d6a6e9fd9d55fbd8a1403aed85e434245dcc6
 2017-04-12 22:28:10 +00:00
Lorenzo Colitti
d0f476bdae Merge changes from topic 'network_specifier' 
* changes:
  [CM] Unhide the NetworkSpecifier as object API
  Make the NetworkSpecifier a class instead of a string.
 2017-04-12 22:27:37 +00:00
Svet Ganov
f75f8ba4a5 Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 am: f9197e0180 -s ours" into oc-dev-plus-aosp 
am: ed0454fa80

Change-Id: Ieaf8c4e1619c18f226ab220d6029770d22275e56
 2017-04-12 22:27:09 +00:00
Julius D'souza
afa5e97db4 Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b am: f72b1104f3 -s ours" into oc-dev-plus-aosp 
am: be09e43773

Change-Id: Ib322b18afd1f084152c2c95fc78b2aac3005f4f8
 2017-04-12 22:26:03 +00:00
Svet Ganov
21a9d7dac7 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 -s ours am: 84ec9cbace 
am: e9e44c7892

Change-Id: Ic41bfe5a321faf090d9694acc299cccb706947db
 2017-04-12 22:24:54 +00:00
Julius D'souza
b825e9cd33 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b -s ours am: 3a967f92f2 
am: b19d94bf80

Change-Id: I7a6c5c8e108140564f0f4ff104501e9eb54cd83f
 2017-04-12 22:23:48 +00:00
Svet Ganov
cb98d9d6f3 Merge "Add autofill feature API" into oc-dev am: a402d6dd2f 
am: bbef731c2d

Change-Id: I3d1429fe4d101072200aae522a2bdf00596273de
 2017-04-12 22:22:39 +00:00
Dianne Hackborn
7ee8c9a485 Merge "Add API to get a uid's current importance." into oc-dev am: ad6ab44e15 
am: ef95ec85ea

Change-Id: I1c9dce1a5e6e049de65a5f68231a195b9e5d4510
 2017-04-12 22:21:30 +00:00
Makoto Onuki
514f1629f9 Merge ""bmgr restore" really should wait until operation finishes." into oc-dev am: b4c2e6f468 
am: 3c0b432ea4

Change-Id: Ib9c45438a8b140028c7e025f4c80ec2d29d9ebc0
 2017-04-12 22:20:25 +00:00
Tony Mak
a06e779bfe Merge "clear calling identity before calling settings provider" into oc-dev 
am: c240c9b134

Change-Id: I7b45453ad9dc57ac6c3a9b83f20731f9dcfbf114
 2017-04-12 22:18:56 +00:00
Dianne Hackborn
90975dc1fc Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev am: f74210c3a3 
am: 33e80232fc

Change-Id: I9a34336bac3636bb672bf640e4525ec24cd6f2f8
 2017-04-12 22:16:05 +00:00
Amit Mahajan
1c29bdda34 Merge "Add p2 option in openLogicalChannel." into oc-dev 
am: 682ce66309

Change-Id: I877f9e817beabcf9786796fd5accf06b1dcb3f36
 2017-04-12 22:13:42 +00:00
Selim Gurun
d07efb9ce3 Merge "Deprecate findAddress() method" into oc-dev am: c68b1a8aef 
am: 24d68dc3d8

Change-Id: I3cacbe34c084eb6f98a141535293d5c783a9243b
 2017-04-12 22:12:57 +00:00
Shuo Qian
c77146ceb1 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f am: 36611a0958 
am: 56d3af6680

Change-Id: Ida75e1835bc99a328baeee71b6838581800916b0
 2017-04-12 22:11:17 +00:00
TreeHugger Robot
c240c9b134 Merge "clear calling identity before calling settings provider" into oc-dev 2017-04-12 22:09:24 +00:00
Amit Mahajan
682ce66309 Merge "Add p2 option in openLogicalChannel." into oc-dev 2017-04-12 22:02:39 +00:00
Jakub Pawlowski
2ef7bb7b06 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b 
am: ce8de6c3f7

Change-Id: I74da41983775b03ee2e642a07b5a8bdcf3be45cf
 2017-04-12 21:56:26 +00:00
Dianne Hackborn
59c6507670 Merge "Allow appops command to modify uid ops." into oc-dev 
am: 81bfe1f62e

Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad
 2017-04-12 21:51:00 +00:00
Jakub Pawlowski
ce8de6c3f7 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 
am: d43127865b

Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04
 2017-04-12 21:45:52 +00:00
nharold
5f676fa7b6 Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp 
am: 9a5d047750

Change-Id: I986d031a47a578fda9f61b58e401e7ff53e24bc3
 2017-04-12 21:43:27 +00:00
Jason Monk
6f23256544 Merge "Make QS light" into oc-dev am: 755138bb1c 
am: 5881209cac

Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91
 2017-04-12 21:42:00 +00:00
Bill Yi
7218bdd562 Merge "Import translations. DO NOT MERGE" into oc-dev am: 88ab6c1304 -s ours 
am: 8c53d24399  -s ours

Change-Id: I13211570b6e817af73bade9bd26828b833892377
 2017-04-12 21:40:52 +00:00
Todd Kennedy
7d0b84e1df Merge "Allow instant app resolution for any user" into oc-dev am: e7b806e9d2 
am: 455b742bb6

Change-Id: I12b658529a580c1d29e7dc99f60b87ff048706a3
 2017-04-12 21:39:55 +00:00
Dianne Hackborn
81bfe1f62e Merge "Allow appops command to modify uid ops." into oc-dev 2017-04-12 21:37:52 +00:00
Seigo Nonaka
ecc3afd49a Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev am: 1e924df63e 
am: fa4b862518

Change-Id: I0aa32f46d20a5d46454f2a6057db2ca0e70f1d84
 2017-04-12 21:37:09 +00:00
Jakub Pawlowski
d43127865b Merge "Bluetooth 5 PHY simplification" 
am: a9acf9db97

Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
 2017-04-12 21:35:25 +00:00
Jesse Evans
93b7acddf8 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 684b5381e9 
am: 3d1676cfc4

Change-Id: I0cc0d165ad5bceb1d93cbe48030e347b53e3caf4
 2017-04-12 21:35:09 +00:00
Android Build Merger (Role)
ed0454fa80 Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 am: f9197e0180 -s ours" into oc-dev-plus-aosp 2017-04-12 21:35:02 +00:00
Svet Ganov
b7190a75de Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 
am: f9197e0180  -s ours

Change-Id: Ib3f118b07fbb994daa70ecbf37bc35dc4d16897b
 2017-04-12 21:34:02 +00:00
Jaewan Kim
7cac2b0e7b Merge "Add documentation for 'am start-foreground-service'" into oc-dev am: e7ce1d40e1 
am: e391fe76e8

Change-Id: Ibf0d1a860cf8cece27f84bb2a9f0c5039ecfd03b
 2017-04-12 21:33:58 +00:00
Android Build Merger (Role)
be09e43773 Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b am: f72b1104f3 -s ours" into oc-dev-plus-aosp 2017-04-12 21:33:46 +00:00
Julia Reynolds
b0453ce03d Merge "Clear calling identity before verifying listeners" into oc-dev am: 43dd3ba3c4 
am: bf3f4dd7f5

Change-Id: Ib0285d815731cf3ef6ed4c06272584284d54209a
 2017-04-12 21:32:54 +00:00
Julius D'souza
c6241aee14 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b 
am: f72b1104f3  -s ours

Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519
 2017-04-12 21:32:43 +00:00