Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,355 Commits 3 Branches 0 Tags
d033e67afe04ba2c3360df7d8f2a7b3e3e85ab73
Commit Graph

33084 Commits

Author SHA1 Message Date
Adam Powell
d033e67afe Merge "Make Scenes and Transitions first-class in PhoneWindow/Themes" 2013-11-06 21:14:03 +00:00
Patrick Tjin
09e0244f72 am b4328566: am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit 'b4328566fa415b69974a9721ec690a1b74880873':
  Add HSPA+ to BatteryStats
 2013-11-06 10:22:32 -08:00
Patrick Tjin
b4328566fa am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
  Add HSPA+ to BatteryStats
 2013-11-06 10:20:00 -08:00
Ruben Brunk
23e1866700 am 57171905: am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '57171905216515a187ecb9931d402c3b09ab4b50':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:15:29 -08:00
Ruben Brunk
5717190521 am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '6327136cdb1a0438132ea9d91c3b498a034ec071':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:13:03 -08:00
Patrick Tjin
bd9513f3b2 Merge "Add HSPA+ to BatteryStats" into klp-dev 2013-11-06 18:12:47 +00:00
Ruben Brunk
6fe15c3d5f Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 2013-11-06 18:07:28 +00:00
Adam Lesinski
2efc144775 am 9aaf4e13: am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '9aaf4e13f0abac9bdee001eb513746c851f22051':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:57:32 -08:00
Adam Lesinski
9aaf4e13f0 am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '35040fdc428669bf7e3a1ec9ea388fb49ede32df':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:54:46 -08:00
Adam Lesinski
1aac29c3dd Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 2013-11-06 17:49:21 +00:00
Patrick Tjin
b71703cfdf Add HSPA+ to BatteryStats 
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.

Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
 2013-11-06 17:29:33 +00:00
Adam Powell
18e905f42d Make Scenes and Transitions first-class in PhoneWindow/Themes 
Add a window feature for content transitions. This implicitly creates
a Scene for each setContentView operation and runs the appropriate
transition. Applications can specify a TransitionManager XML in their
theme that will apply the appropriate transitions when these implicit
scene changes occur. Apps can specify a "to" with no "from" in a
transition to request an entrance transition for the given
content. This lays the groundwork for further full content
change/activity to activity transitions.

Change-Id: Ic815d9e0b9ce958152d70bf6ee01be075aa9fe88
 2013-11-05 17:49:56 -08:00
Jeff Sharkey
8449edb11a am 2b80a35c: am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev 
* commit '2b80a35cb51e6a4f939bdef0cdf8ab39e3f76905':
  Clarify DocumentsProvider recents behavior.
 2013-11-05 14:23:59 -08:00
Jeff Sharkey
2b80a35cb5 am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev 
* commit 'f5073e71c2d5d124865d01ad9343793f6fcf620c':
  Clarify DocumentsProvider recents behavior.
 2013-11-05 13:56:58 -08:00
John Reck
79d81e68aa Remove dead code 
Change-Id: I242eacf68067ffe353802f07d6bfe5bb152fe9d0
 2013-11-05 13:28:34 -08:00
Jeff Sharkey
5f4affdab8 Merge "Clarify DocumentsProvider recents behavior." into klp-dev 2013-11-05 20:46:11 +00:00
Jeff Sharkey
37ed78e504 Clarify DocumentsProvider recents behavior. 
Bug: 11448309
Change-Id: I17e0ac757e549b251e08d58d5ce7d25fb253883f
 2013-11-05 12:38:21 -08:00
Fabrice Di Meglio
93c9093a32 am 641bac8e: am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 
* commit '641bac8e21673a2d526b9c0ccf28d5fd08bd6994':
  Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
 2013-11-04 22:00:22 -08:00
Fabrice Di Meglio
49d6862183 am 346d001b: am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev 
* commit '346d001b6fae9c5abb0de8d58b3c6d778d3508dc':
  Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
 2013-11-04 22:00:18 -08:00
Svetoslav
2dc3477e7f am 109c0a21: am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev 
* commit '109c0a21938cbab8ae1bde594339cbdf338cb559':
  PreferenceFragment showing the breadcrumb when not needed.
 2013-11-04 21:59:59 -08:00
Victoria Lease
8f86d3d28e am c403afb6: am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 
* commit 'c403afb6421f0ab840303ac7f5a207067e976e77':
  use SpannedStringBuilder to build a SpannedString
 2013-11-04 21:59:42 -08:00
Fabrice Di Meglio
641bac8e21 am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 
* commit '073041c3708b5856a027d32c93c6945e2266336e':
  Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
 2013-11-04 21:55:31 -08:00
Fabrice Di Meglio
346d001b6f am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev 
* commit '0804ff1f5a27239c7bc5b02581585f4a61e72aa6':
  Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
 2013-11-04 21:55:27 -08:00
Svetoslav
109c0a2193 am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev 
* commit 'b1dac2f49bd462c9a5f93390ddcc563a7044ea50':
  PreferenceFragment showing the breadcrumb when not needed.
 2013-11-04 21:54:39 -08:00
Victoria Lease
c403afb642 am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 
* commit '79007026935acf84baba183aad0ef654d9ed91aa':
  use SpannedStringBuilder to build a SpannedString
 2013-11-04 21:54:02 -08:00
Newton Allen
04b7821496 am 47feee53: Merge "Fix some documentation typos." into klp-docs 
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
 2013-11-04 19:25:58 -08:00
Alan Viverette
fadfbf1ae0 Merge "Add support for using ColorStateList as GradientDrawable's stroke" 2013-11-05 02:44:31 +00:00
Fabrice Di Meglio
f48bcd5b68 Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 2013-11-05 00:46:19 +00:00
Fabrice Di Meglio
cad157b370 Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev 2013-11-05 00:45:41 +00:00
Alan Viverette
a211dd28b9 Add support for using ColorStateList as GradientDrawable's stroke 
Refactors isOpaque() so that ColorStateList APIs previously added
on master branch are no longer needed.

Change-Id: I104c9a14ef81db6c4cf141e8fd0ebbd20bd52ee9
 2013-11-04 13:46:29 -08:00
Svetoslav
517220b468 Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev 2013-11-04 19:09:49 +00:00
Zhijun He
7f80d6f741 Camera2: hide some face related keys 
STATISTICS_FACE_IDS, STATISTICS_FACE_LANDMARKS, STATISTICS_FACE_RECTANGLES and
STATISTICS_FACE_SCORES are redundant since STATISTICS_FACES can report face
info already.

Bug: 11082745
Change-Id: I8239cee8fdce8f5aea3cc26ca979e41251ca05fa
 2013-11-04 10:18:05 -08:00
Victoria Lease
3dbea35f7e Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 2013-11-04 16:23:15 +00:00
Nick Kralevich
59477290cc Merge "AppOpsManager: fix javadoc misspelling." 2013-11-01 22:48:55 +00:00
Nick Kralevich
e20166acfd AppOpsManager: fix javadoc misspelling. 
Change-Id: I15cb1ed4c46026db248dc5ebc1d46e65c5f7bc0b
 2013-11-01 15:28:29 -07:00
Victoria Lease
6eb3a0e9ba am 24aecc3f: am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev 
* commit '24aecc3fb609ce999a7fef7a610891d5a32eb92c':
  Handle surrogate pairs in Html.toHtml()
 2013-11-01 13:34:10 -07:00
Victoria Lease
24aecc3fb6 am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev 
* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
  Handle surrogate pairs in Html.toHtml()
 2013-11-01 13:30:51 -07:00
Victoria Lease
ee4c84642a Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev 2013-11-01 20:22:42 +00:00
Michael Wright
943345f92a am d35e94a3: am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev 
* commit 'd35e94a3cbd27f08430c593930c989a36f17a833':
  Only call dump when a ViewRoot actually exists
 2013-11-01 13:21:01 -07:00
Michael Wright
d35e94a3cb am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev 
* commit '6be8dde6f6447fe56af2a52554bba77ad0ee8d9c':
  Only call dump when a ViewRoot actually exists
 2013-11-01 13:18:39 -07:00
Michael Wright
4846a93b55 Merge "Only call dump when a ViewRoot actually exists" into klp-dev 2013-11-01 20:11:48 +00:00
Michael Wright
5f48dc7409 Only call dump when a ViewRoot actually exists 
Bug: 11446494
Change-Id: I47e35d7b4d49d6893ba0c9f8ad05b31f91be85d2
 2013-11-01 12:42:49 -07:00
Michael Wright
efdb985f2e am 9730fbc0: am cd250cc8: am 17d28ca3: Check view and focus invariants after calling into app 
* commit '9730fbc0ea71ee0c41c94cf2772cc9884455c4e1':
  Check view and focus invariants after calling into app
 2013-11-01 12:36:28 -07:00
Michael Wright
9730fbc0ea am cd250cc8: am 17d28ca3: Check view and focus invariants after calling into app 
* commit 'cd250cc8b781c64df8b8d63853d9082f29a6fc2f':
  Check view and focus invariants after calling into app
 2013-11-01 12:31:30 -07:00
Michael Wright
17d28ca3d7 Check view and focus invariants after calling into app 
When we dispatch input events into the actual application, make sure
the input invariants we rely on haven't changed. If they have, we
drop the event and log why.

Bug: 11399505

Change-Id: Id772e41ca41dc332bb02725ab486e3b10a73c220
 2013-11-01 19:13:20 +00:00
Adam Lesinski
83c7ac3b8e Fix off-by-one issue when removing from Iterator 
MapCollections' iterator removes the preceding element
which causes IndexOutOfBoundsExceptions to be thrown
when removing the first element while iterating.

bug:11477476
Change-Id: Ifc8fcf0ca1651e759f3b2ab8356404564e9f7d0b
 2013-11-01 12:00:53 -07:00
Svetoslav
7db97b0a29 PreferenceFragment showing the breadcrumb when not needed. 
The breadcrumb section is used for a single pane mode for showing
the current user location. The breadcrumb should not be shown if
its title and subtitle are empty. The code in PreferenceActivity
onCreate updates the breadcrumb with the title and subtitle in
a single page mode but does not hide it if they are empty. This
change fixes that.

bug:11242762

Change-Id: Ib1ba9e8afd9d0ab2e85d78a65ca7c18489464f6d
 2013-11-01 11:57:12 -07:00
John Spurlock
43eed4775d am 9b8145f7: am 17433a63: am b7824a94: Merge "Manage keyguard nav elements using transitions." into klp-dev 
* commit '9b8145f774b0bcccd0b98b1a830a6434a39f3aa2':
  Manage keyguard nav elements using transitions.
 2013-11-01 11:56:39 -07:00
John Spurlock
9b8145f774 am 17433a63: am b7824a94: Merge "Manage keyguard nav elements using transitions." into klp-dev 
* commit '17433a633a3d415fc1932738c0814c3dc6716683':
  Manage keyguard nav elements using transitions.
 2013-11-01 11:54:32 -07:00
Marco Nelissen
88e82ed2fe Merge "Use audio focus instead of legacy music command" 2013-11-01 16:54:03 +00:00