Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,578 Commits 3 Branches 0 Tags
d98785e288e1171f49cf2a09686190dad07fb286
Commit Graph

58696 Commits

Author SHA1 Message Date
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1 
am: 0666069

* commit '06660697a3198835b5a7955f3955e58fb92e407f':
  Fixes name of intent launch flag for Action Extender

Change-Id: Ia824a1bc0a6c52697e0e0ce7cea0f6448ef60594
 2016-04-12 17:29:39 +00:00
Alex Hills
06660697a3 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 
am: e3f3cb1

* commit 'e3f3cb10484260fac167e59d0178902a63ea7a6b':
  Fixes name of intent launch flag for Action Extender

Change-Id: Idbfc4beca1067031b9a7608930aa61779644901e
 2016-04-12 17:24:10 +00:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00
Alan Viverette
b6562af43f Merge "Default font scale is 1 if not otherwise specified" into nyc-dev am: 0f0ffb0 
am: 6265624

* commit '6265624bf3f992cfa510e04a5656568033789a94':
  Default font scale is 1 if not otherwise specified

Change-Id: Ibb1062c44afd7c22e24ae59492ccb450df2a5fa5
 2016-04-12 16:40:24 +00:00
Alan Viverette
6265624bf3 Merge "Default font scale is 1 if not otherwise specified" into nyc-dev 
am: 0f0ffb0

* commit '0f0ffb0450e223dab3a0e85f2968156c0da324b3':
  Default font scale is 1 if not otherwise specified

Change-Id: I25965bc2f5ec3dbd7a517f7b69f1cfa50fbaa5ce
 2016-04-12 16:34:56 +00:00
Alan Viverette
0f0ffb0450 Merge "Default font scale is 1 if not otherwise specified" into nyc-dev 2016-04-12 16:29:28 +00:00
Alex Hills
4ec3ff4f8f Fixes name of intent launch flag for Action Extender 
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty

Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
 2016-04-12 11:44:36 -04:00
Mark Renouf
0878022e22 Merge "Customizes input extract edit view for Wear" into nyc-dev am: bbc9823 
am: 0c133c8

* commit '0c133c82b5e58292739ed62fe5eb7a4bb465ceed':
  Customizes input extract edit view for Wear

Change-Id: I570acac5236e5a8084dd20f60572c000222c375d
 2016-04-12 15:34:33 +00:00
Mark Renouf
0c133c82b5 Merge "Customizes input extract edit view for Wear" into nyc-dev 
am: bbc9823

* commit 'bbc98232f36542f9245053371e385a2788490c2b':
  Customizes input extract edit view for Wear

Change-Id: I43ce88ccda7812aa5275d58a6125ced1b52a2b3a
 2016-04-12 15:29:09 +00:00
Mark Renouf
91eb2651a0 Customizes input extract edit view for Wear 
Provides an alternate presentation of the extract edit area
of an input method window, designed for sub 250dp width screens.

An icon is used on a round material style button in place of a text
action, providing more horizontal space for the editing area.

BUG: 28098677
(cherry picked from commit fd71a6a5d99bad5d3ab32edc328fb5b026b66215)

Change-Id: I0e559d17f78d1a48b37979a49e11ae1aad7503f4
 2016-04-12 15:05:13 +00:00
Alan Viverette
04fd67cb8e Default font scale is 1 if not otherwise specified 
Prevents the previous user's font scale from being used as the default.

Bug: 27187556
Change-Id: I51a66ddf2d6272bd74d433158db1c8cc54b45b6d
 2016-04-12 10:54:04 -04:00
John Reck
d8b22c5ff9 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev am: d2eec0e 
am: f3c2dee

* commit 'f3c2dee3e117433c76e04513047b39cad2d2b5e6':
  Framework-side of SurfaceView#getBitmap

Change-Id: I60d5b10c643fbb646a69fa6896f3c83bde273256
 2016-04-12 14:51:08 +00:00
John Reck
f3c2dee3e1 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev 
am: d2eec0e

* commit 'd2eec0efb2e47b23b2a12ab2967e422f0be49094':
  Framework-side of SurfaceView#getBitmap

Change-Id: I4da75d89a536c11dbaa9ee1feba8e5838fbb5a41
 2016-04-12 14:45:44 +00:00
John Reck
d2eec0efb2 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev 2016-04-12 14:36:11 +00:00
Kirill Grouchnikov
e1684cda2b Merge "Add @TestApi method to Spinner to test whether popup is showing." 2016-04-12 12:29:08 +00:00
Oleksandr Peletskyi
0ec262cda4 Merge "Fixed cross profile usage of TextClock." into nyc-dev am: 26e3385 
am: 08fb03c

* commit '08fb03c261bab00ebb69bb6449bfcf215e09f604':
  Fixed cross profile usage of TextClock.

Change-Id: I724e7310e2e0f5f7a45c1831ad05cea3336af302
 2016-04-12 11:48:32 +00:00
Oleksandr Peletskyi
08fb03c261 Merge "Fixed cross profile usage of TextClock." into nyc-dev 
am: 26e3385

* commit '26e33855089ddfb0e4fee4ee7df2c316c6f30a82':
  Fixed cross profile usage of TextClock.

Change-Id: I35651f1192d5e3890e674755c8897224c5a28db8
 2016-04-12 11:43:19 +00:00
Oleksandr Peletskyi
26e3385508 Merge "Fixed cross profile usage of TextClock." into nyc-dev 2016-04-12 11:33:19 +00:00
Siyamed Sinir
a8709c7160 Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev am: 9f98646 
am: c7f1e02

* commit 'c7f1e02dd162eaadca61aa3ea5164ba814d2b4ef':
  Fix Patterns.UCS_CHAR character class

Change-Id: Ia18e65d71c97317195dcc7f1e84790681b39b45a
 2016-04-12 02:41:59 +00:00
Siyamed Sinir
c7f1e02dd1 Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev 
am: 9f98646

* commit '9f986466f45d4d114a76b3efe3b2986844d80bcd':
  Fix Patterns.UCS_CHAR character class

Change-Id: I3d8cbd995ce977b7afa97beed3512b479c16d427
 2016-04-12 02:37:01 +00:00
Siyamed Sinir
7903aba3ca Fix Patterns.UCS_CHAR character class 
Wrap Patterns.UCS_CHAR character class with brackets. Previously CL
Ie6df818dc4d33dfee6ee54432a2231cca51ec423 broke autoLink email and URL
patterns while excluding the empty spaces.

Bug: 28020781
Change-Id: Ieb7d09cb5e544c1e7cbc1a4d665b979c65e7e773
 2016-04-11 18:45:29 -07:00
Siyamed Sinir
4b46826f16 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev am: 4b92594 
am: cda996c

* commit 'cda996cff8ab4a0b8009768a6754a031b2c2a731':
  Exclude unicode space characters from autoLink URL patterns

Change-Id: I00026490816b2a64424effe34d349870eaeae549
 2016-04-12 00:48:10 +00:00
Siyamed Sinir
cda996cff8 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev 
am: 4b92594

* commit '4b92594857ce52f96252f43c776f3ed31f0ebdfb':
  Exclude unicode space characters from autoLink URL patterns

Change-Id: Ie8c41292ab33ed50cd41a62eaa98ca7f1a06db14
 2016-04-12 00:43:08 +00:00
Siyamed Sinir
4b92594857 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev 2016-04-12 00:35:29 +00:00
Jeff Sharkey
3af69b89b3 Merge "Fix notifications that are sent for USER_ALL." into nyc-dev am: 01a1ad5 
am: 4ed2fb8

* commit '4ed2fb8b5cfe63087d155d1f4f2bbe0b8a312980':
  Fix notifications that are sent for USER_ALL.

Change-Id: Ifa2314c4f0f913f92f22fe02ff770912e307e913
 2016-04-11 23:30:46 +00:00
Makoto Onuki
1187239423 Merge "ShortcutManager: First cut of CTS" into nyc-dev am: bc20320 
am: 0beb56d

* commit '0beb56d4e49f433759f7c825374c90442f2aed53':
  ShortcutManager: First cut of CTS

Change-Id: I048150bf9451e8d28dc599673321bd31f8d119a1
 2016-04-11 23:30:43 +00:00
Jeff Sharkey
4ed2fb8b5c Merge "Fix notifications that are sent for USER_ALL." into nyc-dev 
am: 01a1ad5

* commit '01a1ad511e126aca0b445457f06e31f903b84ffb':
  Fix notifications that are sent for USER_ALL.

Change-Id: I73f0984bf8d298017577fbe20406a0f19996fed6
 2016-04-11 23:25:25 +00:00
Makoto Onuki
0beb56d4e4 Merge "ShortcutManager: First cut of CTS" into nyc-dev 
am: bc20320

* commit 'bc20320f7f224d1cc5be3c436a1a5ece2067f2ec':
  ShortcutManager: First cut of CTS

Change-Id: I23d24480870644cf69575d2f11bfc55056c0fb96
 2016-04-11 23:25:23 +00:00
Jeff Sharkey
01a1ad511e Merge "Fix notifications that are sent for USER_ALL." into nyc-dev 2016-04-11 23:19:07 +00:00
Jeff Sharkey
012bc7bb9f Fix notifications that are sent for USER_ALL. 
Also avoid creating a heavy LoadedApk object which will be cached
around in the long-lived system process.

Bug: 28116427
Change-Id: I1a5fc43e6d559a09088636b2fe4b5c76f08d3413
 2016-04-11 17:18:29 -06:00
Adam Powell
1629a08fb9 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev am: e60b8f8 
am: 701bb7a

* commit '701bb7ae13879764b316918042fe8118664d73af':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: Ia089ebf5b2ba924ceb8e57132ed5c89b7211b8a5
 2016-04-11 23:14:40 +00:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00
Adam Powell
701bb7ae13 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev 
am: e60b8f8

* commit 'e60b8f897065a9600058a7b958f1e0bcd198b0b5':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: I93fd543a33d9a78f7dbbcadb3261b2e53fd8f2ba
 2016-04-11 23:09:36 +00:00
John Reck
10dd0585c1 Framework-side of SurfaceView#getBitmap 
Bug: 27708453

Change-Id: Ie6fd7eca522d3e6549d8af587c975fd7e6053649
 2016-04-11 16:00:22 -07:00
Adam Powell
e60b8f8970 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev 2016-04-11 22:57:47 +00:00
Makoto Onuki
5ba0d3e3a3 ShortcutManager: First cut of CTS 
Bug 27548047

Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
 2016-04-11 14:48:44 -07:00
Robert Greenwalt
7a05c769db Merge "Add settings for SUW data control." into nyc-dev am: 6e1e880 
am: ad1f6a7

* commit 'ad1f6a7b0d3c1bad717118802b75a4d53479dbf0':
  Add settings for SUW data control.

Change-Id: I3ca7d49a6bab90778306d07d1c46a8f65c058e48
 2016-04-11 21:40:54 +00:00
Greg Kaiser
925d91138b Merge "NanoApp: Make indentation consistent" into nyc-dev am: 7c0393a 
am: c0b5c1c

* commit 'c0b5c1c89798233c7b6113e7ac6e4c2887bd5656':
  NanoApp: Make indentation consistent

Change-Id: I6de32ace7386c7afa8a01d98eeb89ea1b1d5468f
 2016-04-11 21:40:51 +00:00
Robert Greenwalt
ad1f6a7b0d Merge "Add settings for SUW data control." into nyc-dev 
am: 6e1e880

* commit '6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
  Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4
 2016-04-11 21:35:48 +00:00
Greg Kaiser
c0b5c1c897 Merge "NanoApp: Make indentation consistent" into nyc-dev 
am: 7c0393a

* commit '7c0393abdf121aca271f870d492def5b329b6360':
  NanoApp: Make indentation consistent

Change-Id: Ib1cdcfc2fe61266d4fcac44739f9273737108f56
 2016-04-11 21:35:46 +00:00
Robert Greenwalt
6e1e880f00 Merge "Add settings for SUW data control." into nyc-dev 2016-04-11 21:28:01 +00:00
Adam Powell
eba13dd07f Prevent duplicate loader onLoadFinished calls on config change 
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.

In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.

Bug 28074512

Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
 2016-04-11 14:26:58 -07:00
Greg Kaiser
7c0393abdf Merge "NanoApp: Make indentation consistent" into nyc-dev 2016-04-11 21:21:37 +00:00
John Reck
f641379e1e Merge "Revert "Make stopped state a first-class thing"" into nyc-dev am: 825fa4d 
am: 26d6685

* commit '26d6685d1eb59da2799d6c4d45b9ff67a537e99b':
  Revert "Make stopped state a first-class thing"

Change-Id: Ibcbd0b9a3246f67e41c293f5f1e79cffca3a9ec8
 2016-04-11 21:15:18 +00:00
John Reck
26d6685d1e Merge "Revert "Make stopped state a first-class thing"" into nyc-dev 
am: 825fa4d

* commit '825fa4d5ae7b2907ee1769d09e6333306de2a92e':
  Revert "Make stopped state a first-class thing"

Change-Id: I2f2a6281d0e0ba9587b00cdb6f1cb32ac632ee41
 2016-04-11 21:05:20 +00:00
John Reck
825fa4d5ae Merge "Revert "Make stopped state a first-class thing"" into nyc-dev 2016-04-11 20:54:36 +00:00
John Reck
eab3f2658a Revert "Make stopped state a first-class thing" 
This reverts commit 945961f78a.

Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714
 2016-04-11 20:49:28 +00:00
Greg Kaiser
1f3560e75e NanoApp: Make indentation consistent 
Four spaces is our style standard.

Change-Id: I94f4493268e29b7de5d4fc0f5ef98637997b3957
 2016-04-11 12:49:21 -07:00
Greg Kaiser
4f633c7d32 Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev am: f4d3805 
am: 1fd8534

* commit '1fd853468f4071cbdeb913954c9786d6cb6347ef':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Id42d34e96b39771a41acad0690553aecf896dd08
 2016-04-11 17:35:52 +00:00
Greg Kaiser
1fd853468f Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 
am: f4d3805

* commit 'f4d380537a2d52c147d5c69d8ec124529fa4f7e6':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Ie66a50ba0bdf10fcf4dfb91acfd5d1cd276dda88
 2016-04-11 17:30:49 +00:00