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

143158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:28 +00:00
Deepanshu Gupta
a3d2c7e72b am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:20 +00:00
Deepanshu Gupta
610341b3eb am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:19 +00:00
Deepanshu Gupta
964591a6e1 am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:44:52 +00:00
Deepanshu Gupta
e83fa180a8 am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:44:11 +00:00
Deepanshu Gupta
d8d3e87cf3 am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:42:10 +00:00
Deepanshu Gupta
95bbeb9672 am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:41:18 +00:00
Deepanshu Gupta
f75489f2f1 am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:42 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:35 +00:00
Deepanshu Gupta
696eb4da44 am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:33 +00:00
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
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
Wonsik Kim
61acf46d6a Merge "TIF: revise API names" into lmp-dev 2014-07-17 21:07:39 +00:00
Sungsoo Lim
9bf671f8ee TIF: revise API names 
- TvInputManager: TvInputCallback -> TvInputListenter
- TvParentalControlManager: ParentalControlCallback -> ParentalControlListener
- TvView: unblockContent -> requestUnblockContent

Change-Id: I58220e86a4e59ee7d8f28fab833f09cd603b1e38
 2014-07-19 21:22:16 +09:00
Wonsik Kim
6b11ea1ab1 Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 2014-07-17 21:07:39 +00:00
Dongwon Kang
1034df8c63 TIF: Reorder TvInputInfo types from old to new. 
This change is internal cleanup change. The purpose of this change is
to reorder the types so that new types can be added at the end of the
type list later.

Change-Id: I377c98dc397ef75c3473ee5133b2ffb49d278a50
 2014-07-19 18:48:32 +09:00
Wonsik Kim
6e0b960f43 Merge "TIF: misc fix for TvInputHal" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
610ccd9117 TIF: misc fix for TvInputHal 
- Fixed synchronization issues
- Add a few debugging logs
- Removed unused types from TvInputHal.

Change-Id: Ia5eb8a496cc3e98cb2c2ed0f77a6a313d33bf6c9
 2014-07-19 19:01:00 +09:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features 
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
 2014-07-19 02:14:00 -07: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
Guang Zhu
b477fc6c2f Merge "add command to enable bt snoop log" into klp-modular-dev 2014-07-17 19:26:18 +00:00
Guang Zhu
946f207d3d add command to enable bt snoop log 
Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2
 2014-07-17 20:24:56 -07:00
Baligh Uddin
802603572c Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 2014-07-17 19:13:40 +00:00
Baligh Uddin
50af6d7ae6 Remove deprecated locales - DO NOT MERGE 
Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
 2014-07-19 13:05:12 -07:00
John Spurlock
7b41467704 Zen mode filtering should use new usage constants. 
Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
 2014-07-19 11:57:51 -04:00
Adam Powell
781104d874 Merge "Don't apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
2aa09a94dd Don't apply the ActionBar style to a Toolbar as a result of setActionBar 
While this is a convenient idea, it effectively means that any styling
directly applied to a Toolbar in a layout gets stomped by the
theme-global ActionBar style. Obey the more local, specific styling
from the Toolbar instead.

Change-Id: Ief6a7cb90052bdced87f1dc0925c1dfbc0df4792
 2014-07-19 16:01:12 -07:00
Adam Powell
5abc26e00a Don't overlay the Material.Light theme's homeAsUpIndicator attribute 
Current API expects the default ActionBar styles not to have the
homeAsUpIndicator defined, thereby inheriting it from the theme itself
when changed there. Remove the stray definition in the light material
action bar style that was blocking this from happening.

Bug 15458606

Change-Id: Ia7fdbde814582a1d3eb8743bf76bc019f6ac7488
 2014-07-19 15:56:32 -07:00
Yohei Yukawa
ad8f1673f6 Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 2014-07-17 21:15:46 +00:00
Yohei Yukawa
ff328ae743 Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView 
This CL adds an initial support of
CursorAnchorInfoRequest#FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE for
TextView.

This implementation is not highly optimized yet, but it just
works as it should.

BUG: 16379288
Change-Id: Iecb32b4c4dcd7db14d8b2a0d929e1d64e161bc58
 2014-07-19 12:59:52 +09:00
John Reck
c01bd1167a Return Animator instead of ValueAnimator 
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
 2014-07-19 02:00:15 +00:00
Fabrice Di Meglio
6eed108eeb Revert "Fix LocalePicker background" 
This reverts commit 6bbea8cf4252839d0c6f2a3152f506a7b2b2d753.

Change-Id: I430c725c8e5987fb643528594ef3a9a83827e7be
 2014-07-19 01:58:09 +00:00
Wei Wang
685c175890 More API modification of BLE APIs (1/2). 
Changed include:

1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.

Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
 2014-07-18 18:31:00 -07:00
John Spurlock
a082e35d94 Merge "Volume: No sound effects on the ringer toggle." into lmp-dev 2014-07-17 19:20:15 +00:00
John Spurlock
ab4ea76ede Volume: No sound effects on the ringer toggle. 
We beep and blort enough in the rocker when switching modes.

Bug:16377522
Change-Id: I4a61979cb323d6a9623d10e10547a19982db384f
 2014-07-19 18:50:16 -04:00
Evan Charlton
1019719e46 Migrate TelecommConstants to TelecommManager 
Change-Id: Icdd7637ba1ae27ce7d1f13714257b4a946961037
 2014-07-19 15:33:59 -07:00