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

143406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
85c7b209c3 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:25 +00:00
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:38:39 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00
Guang Zhu
f59ce46880 am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log
 2014-07-18 03:31:43 +00:00
Baligh Uddin
caf26263a7 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-17 21:15:46 +00:00
Baligh Uddin
5a4bdf8144 Import translations. DO NOT MERGE 
Change-Id: I5f9b029d8be54fb3ed6ce28b5e64640ab3d676ea
Auto-generated-cl: translation import
 2014-07-22 16:39:28 +00:00
Baligh Uddin
85c9ecc126 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 22:16:50 +00:00
Baligh Uddin
9666f97dff Import translations. DO NOT MERGE 
Change-Id: I2808fa9de557f81f25e19b14b8db854516c759a4
Auto-generated-cl: translation import
 2014-07-22 16:39:54 +00:00
Baligh Uddin
6f5a87b517 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 22:16:50 +00:00
Baligh Uddin
9943e9d2e8 Import translations. DO NOT MERGE 
Change-Id: Id27934ed36650e801d1c339e18aca05e8669e268
Auto-generated-cl: translation import
 2014-07-22 16:40:43 +00:00
Baligh Uddin
4979926830 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 22:16:50 +00:00
Baligh Uddin
fc68e86e0c Import translations. DO NOT MERGE 
Change-Id: I2093c5d8b426d447e97a99b98bd67338eab4fcc0
Auto-generated-cl: translation import
 2014-07-22 16:42:41 +00:00
John Spurlock
657c62c31e QS: Hide Location, Cast tiles when showing secure keyguard. 
Bug:15725186
Bug:15725223
Change-Id: I7c23d8c764f5712ee31d248f4d8fc6d35d0add97
 2014-07-22 12:24:37 -04:00
Justin Koh
a63272b4b5 Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Justin Koh
528b4b7572 Revert "Wait for all windows to draw before turning screen on" 
This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
 2014-07-22 00:26:23 +00:00
Deepanshu Gupta
4627c98da4 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Ricardo Cervera
9c36b83519 am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:34:58 +00:00
Ricardo Cervera
7a42536083 am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-17 20:31:01 +00:00
Robert Ly
ee65b63d25 am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:30:32 +00:00
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:27:03 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
 2014-07-17 19:55:32 +00:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev 
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
 2014-07-17 19:55:27 +00:00
John Spurlock
bfd2929d5d Merge "QS: Move flashlight tile before location tile." into lmp-dev 2014-07-17 19:26:18 +00:00
John Spurlock
00e004e653 QS: Move flashlight tile before location tile. 
Bug:16464515
Change-Id: Id1f790a56935cd10ea268153842654b29cca24d5
 2014-07-22 09:48:03 -04:00
John Spurlock
1fa865f396 New NotificationListenerService listener flags api. 
Give activated listeners the ability to request changes to
listener-level or host-level state.

Currently this consists of the ability to suppress notification alerts
(alerts = the haptic / audio feedback of a notification).

Bug:15888672
Change-Id: I045e3b99d1f15e3f96ebaf17d3083a97e02ecb42
 2014-07-22 07:24:22 -04:00
Craig Mautner
807badbebc Merge "Convert from elapsed time to absolute time." into lmp-dev 2014-07-21 15:42:19 +00:00
Craig Mautner
494f6bdd9a Convert from elapsed time to absolute time. 
Using uptime to determine most recent task doesn't work across
reboots.

Fixes bug 16370277.

Change-Id: Icef3342aba3fc009c307175b7524530c4cb617d2
 2014-07-22 06:10:02 +00:00
Dongwon Kang
9f7c25ebeb Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev 2014-07-17 22:03:23 +00:00
Dongwon Kang
fe9259e6a7 TIF: Revisit types in TvInputInfo and TvContract.Channels. 
For the types in TvInputInfo, TYPE_TUNER represents all the TV inputs
having channels in TvProvider. Also, String is used for the types in
TvContract.Channels for further extension.

Change-Id: Iee1163b449d9f9723ff665178f2967bb8c0ad71d
 2014-07-22 16:58:51 +09:00
Jinsuk Kim
29a5d26207 Define a constant for HDMI-CEC logical address used for internal source 
Change-Id: Ic7d6a5378361d7ed8ae4b635312b956b063fc95a
 2014-07-22 07:37:45 +00:00
Jinsuk Kim
49b47bbef8 Invoke device event listeners when clearing CEC devices 
This updates the client of HdmiControlService so that CEC devices
will disappear when thd CEC control is disabled.

Bug: 16467361

Change-Id: If6fad3be0aa3335aa7f955c0586040250e9c0e06
 2014-07-22 07:36:48 +00:00
Jungshik Jang
b35fba0265 Merge "Follow up send message errors of hdmi_cec.h in service side" into lmp-dev 2014-07-17 21:11:29 +00:00
Jungshik Jang
30a356a419 Follow up send message errors of hdmi_cec.h in service side 
Change-Id: Icc64e6324250230c939b04ab37c999f50afe7bf2
 2014-07-22 13:55:38 +09:00
Jeff Brown
970d4132ea Allow dreams to control screen state and brightness. 
Added setDozeScreenState() and setDozeScreenBrightness() methods to
DreamService.  The values specified here only take effect once
startDozing is called and can be changed while dozing.

This required some significant rework of the display power controller
but the result seems quite nice and better represents the policy
we want to apply.

Changed the test dream a little bit to make it flash the screen
every minute using the new functions.

Bug: 15903322
Change-Id: I83bcc34503f1b87727d2b2b3c0ef08507f9f0808
 2014-07-22 01:18:26 +00:00
Deepanshu Gupta
f89bff9ed8 am aa474ff0: (-s ours) am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev 
* commit 'aa474ff0f3bf68110dc60f9472c062ff1a4a44ae':
  LayoutLib: Fix EditText rendering [DO NOT MERGE]
 2014-07-22 01:09:02 +00:00
Deepanshu Gupta
52948ffdf2 am b51750fd: (-s ours) am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev 
* commit 'b51750fda671c8ec7a7ed9037aad1a65e49539ec':
  Update layoutlib create README [DO NOT MERGE]
 2014-07-22 01:08:55 +00:00
Dianne Hackborn
dc2cfff87c Merge "Add permissions associated with app ops." into lmp-dev 2014-07-19 22:40:06 +00:00
Dianne Hackborn
33f5ddd1be Add permissions associated with app ops. 
Change-Id: I575ad7a3ceea59486ca601f69760b14f6269511d
 2014-07-21 20:15:59 -07:00
Adam Powell
66e207ec54 Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev 2014-07-21 15:42:19 +00:00
Adam Powell
02a7b78eab Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars"" 
This reverts commit 9d629b6daba8c433fe014728e1ad07e034906c79.

Once more, with feeling!

Bug 16284253
 2014-07-21 18:12:34 -07:00
Adam Powell
88c11754c1 Allow focusable in touch mode views to ignore touchscreen focus blocks 
Bug 16284253

Change-Id: I7cddf1988b0c24ae3050a13d2ce6fb3143d8aade
 2014-07-21 18:12:34 -07:00
Alan Viverette
90d8d2c406 Merge "Remove unused quick setting display preferences" into lmp-dev 2014-07-19 22:40:06 +00:00
Dirk Dougherty
4ebdd2f075 am b8109996: am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'b81099963772f886e68129c33f32fefb85ac673e':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 01:04:30 +00:00
Alan Viverette
06da1b1ceb Remove unused quick setting display preferences 
BUG: 16303790
Change-Id: I0772228aac5a743b9780853c5825252c148b8b5c
 2014-07-22 01:04:19 +00:00