Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,801 Commits 3 Branches 0 Tags
bfac3f5ec6cd7a78600dbece8cb451d6866de5e1
Commit Graph

63426 Commits

Author SHA1 Message Date
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
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
Mihai Nita
e66546c268 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev 
am: e544d40

* commit 'e544d408c06fe3e6bc3b237f718b56f03f079f29':
  Use DisplayNameWithDialect only for some locales

Change-Id: I0611e41a010c6b5c4a937c8c5de501d3749cd438
 2016-04-12 05:03:34 +00:00
Mihai Niță
e544d408c0 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev 2016-04-12 04:56:05 +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
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
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
Mihai Nita
1b2e7adc88 Use DisplayNameWithDialect only for some locales 
Although DisplayNameWithDialect seems to return friendlier, more
"casual" names (e.g. "American English"), the result was inconsistent,
and (at times) debatable. And since this setting affects not only
the language of the translation, but a locale, names like "Flemish"
kind of lost the whole "locale / location" idea.

So we revert to use DisplayName for all but a few selected locales
(that we verified are better with the "dialect" form).

Bug: 27704583
Change-Id: I587081da1293cccac3cdabcd188a9b8160c233ea
 2016-04-11 16:13:54 -07: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
Yohei Yukawa
a8bee2d763 Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev 
am: 9dd39f8

* commit '9dd39f8bcc7f6f12e2e65cf2fcdf27cd169b5268':
  Shift+Meta+Space should reverse-rotate subtypes part 2.

Change-Id: I2b4d2c4856b1182d374163b10a3f614112d4472d
 2016-04-11 22:37:43 +00:00
Yohei Yukawa
9dd39f8bcc Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev 2016-04-11 22:33:25 +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
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
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
Yohei Yukawa
b1e2f4fc3a Shift+Meta+Space should reverse-rotate subtypes part 2. 
This CL adds JavaDoc to clarify what previous CL [1] wanted to do.
No behavior change is intended in this CL.

 [1]: I3694edd80be6dfe18b90360e24ae4d451b331928
      d39ae85482

Bug: 25753404
Bug: 28103839
Change-Id: I246223c0856382d68323f22987b998cd1613e98c
 2016-04-11 13:38:36 -07: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
Alan Viverette
435d55e66b Merge "Revert "Add scroll indicators to resolver list layouts"" into nyc-dev 
am: 76961cc

* commit '76961ccc52c5cb9d73336782be2d74c23600c5a3':
  Revert "Add scroll indicators to resolver list layouts"

Change-Id: If7517611b7130e1c0995f14ffb0fff052d23a2e1
 2016-04-11 18:07:09 +00:00
Alan Viverette
76961ccc52 Merge "Revert "Add scroll indicators to resolver list layouts"" into nyc-dev 2016-04-11 17:57:59 +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
Greg Kaiser
f4d380537a Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 2016-04-11 17:23:48 +00:00
Makoto Onuki
9a98e4679a Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev 
am: 390a813

* commit '390a81302f13a0285e58e550cf786255ce5f8bd8':
  Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs.

Change-Id: Ice1ba7818ca5da2da91d0cf1a3bc2baace82c7e8
 2016-04-11 16:56:14 +00:00
Fyodor Kupolov
036bdcac44 Merge "Added getProfileIds method returning array of userIds" into nyc-dev 
am: 4c74334

* commit '4c74334c4425e43dfb53bc2ef707eebb1bef7d5b':
  Added getProfileIds method returning array of userIds

Change-Id: Iea98c0fa6062e759da3adfe35c324a018aef2223
 2016-04-11 16:46:01 +00:00
Chris Thornton
289eedb6e8 Merge "Support multiple Enrollment APKs" into nyc-dev 
am: 9e928c1

* commit '9e928c1f715c53cc9cd6a85b3dcdcdc68cabc9c6':
  Support multiple Enrollment APKs

Change-Id: I66fbc18f3291a4178fdfb613c6a4e905edf5715e
 2016-04-11 16:45:59 +00:00
Makoto Onuki
390a81302f Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev 2016-04-11 16:45:10 +00:00
Fyodor Kupolov
4c74334c44 Merge "Added getProfileIds method returning array of userIds" into nyc-dev 2016-04-11 16:40:55 +00:00
Chris Thornton
9e928c1f71 Merge "Support multiple Enrollment APKs" into nyc-dev 2016-04-11 16:40:43 +00:00
Yohei Yukawa
72c98d6a08 Merge "Make additional IME Subtype ID persistent." into nyc-dev 
am: 063fe65

* commit '063fe652be5ac01f1d4ffe621dc2a5f7e2170198':
  Make additional IME Subtype ID persistent.

Change-Id: I468fdb96d5a4963ae905059e38178e775da7755d
 2016-04-11 15:54:31 +00:00
Yohei Yukawa
063fe652be Merge "Make additional IME Subtype ID persistent." into nyc-dev 2016-04-11 15:46:12 +00:00
Greg Kaiser
cb83bd04b7 ContextHubManager: Avoid bad NanoApp objects 
We provide a preferred constructor for the user which will
always generate a serializable NanoApp object.  While we
still support the other path, we throw a specific exception
when trying to serialize a bad NanoApp object to ease
debugging.

Change-Id: I7ee610f0fce2f0dd489526e4819f66035281024b
 2016-04-11 08:27:10 -07:00
Benjamin Franz
9a9a9aa9b3 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev 
am: 3f7fdaa

* commit '3f7fdaaa766104cc5b8946676c9187661cb60aa7':
  Revert "Throw security exception for non-parent aware APIs"

Change-Id: I2c4754cb70096372f2b04f1f52ecc2c93a5f8ae2
 2016-04-11 14:41:38 +00:00
Lorenzo Colitti
73ab8fd683 Merge changes Ic2c84de7,I379aef92 into nyc-dev 
am: b89d33e

* commit 'b89d33ee4467161cb270d765bd873efab781004d':
  Remove duplicated code in NetworkStateTrackerHandler.
  Improve Tethering and NativeDaemonConnector logging.

Change-Id: I52159cd2e94d951699c21be656782b45b19f03d7
 2016-04-11 14:37:03 +00:00
Benjamin Franz
3f7fdaaa76 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev 2016-04-11 14:32:49 +00:00
Lorenzo Colitti
b89d33ee44 Merge changes Ic2c84de7,I379aef92 into nyc-dev 
* changes:
  Remove duplicated code in NetworkStateTrackerHandler.
  Improve Tethering and NativeDaemonConnector logging.
 2016-04-11 14:27:31 +00:00
Alan Viverette
cc329e0cfe Revert "Add scroll indicators to resolver list layouts" 
This reverts commit 81181dc356.

Change-Id: Ib5003bb131402bef007ce8025afcdb4a8f620541
 2016-04-11 13:42:18 +00:00