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

143209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Spurlock
9bc41d44d6 Merge "Add audioAttributes to Notification." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
c0650f02b8 Add audioAttributes to Notification. 
@deprecate the old audioStreamType-based metadata in favor
of attribute-based replacements.

Bug:16401631
Change-Id: I2c140f87dd4ad2141c6c0a6f391877c295973866
 2014-07-19 13:22:39 -04:00
John Spurlock
50e71cc35b Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev 2014-07-17 19:20:15 +00:00
John Spurlock
0635b8927e Volume: restore vibration entering vibrate-mode from rocker. 
Bug:16418732
Change-Id: I0db18a0ff21cfa1af7005ab9620340d34c2eb63b
 2014-07-19 17:52:35 -04:00
Baligh Uddin
cbaac81b70 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
4fc8c66cd4 Import translations. DO NOT MERGE 
Change-Id: I7b6175e9d105f252fd57427b2c15ec31905e6184
Auto-generated-cl: translation import
 2014-07-19 21:41:31 +00:00
Evan Charlton
222db525ed Add a notion of the subscription number 
Expose the actual subscription number so that it can be exposed when
necessary (such as during emergency calls, when it doesn't match the
line 1 number).

Bug: 13333595
Change-Id: I0d3b2cfcea08aeba760c392c116303f21beb70d3
 2014-07-19 21:22:31 +00:00
Adam Powell
6b067c3402 Merge "Measure Toolbar titles last" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
b606a3a312 Measure Toolbar titles last 
Give the maximum amount of room to "real" content views before taking
up space for the title and subtitle of a toolbar.

Bug 16039951

Change-Id: I10da9cdc39e84e6fb3975ee40958c57031002dd5
 2014-07-19 13:26:16 -07:00
Adam Powell
c80f952285 Fix Toolbar title layout in RTL mode 
Welp, that one was embarrassing.

Bug 16192193

Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
 2014-07-19 13:05:26 -07:00
Baligh Uddin
68cbf10b56 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
7bc83dc414 Import translations. DO NOT MERGE 
Change-Id: I179193c20f5362e2c1afb3ea15c623e63e15a688
Auto-generated-cl: translation import
 2014-07-19 21:41:49 +00:00
Adam Powell
fba286a056 Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
eb97f473fc Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand 
When Toolbar is acting in the role of an action bar it needs to handle
the case where app code calls setLayoutParams on a custom view with an
ActionBar.LayoutParams instance. Run the newly set LayoutParams
through the check/generate routine normally performed when adding a
child view whenever LayoutParams are set on an existing child to
correct for it.

This might not be a bad thing to generalize someday but it would make
for very confusing compatibility behavior when running code that
was written to expect it on older platform versions.

Bug 16219488

Change-Id: I568a335fe8ebbbaa666690d1f0e95f313abd2f1e
 2014-07-19 11:57:21 -07:00
Baligh Uddin
6b1072e07a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
2d3347afed Import translations. DO NOT MERGE 
Change-Id: I99e29201cdc548124a501255a619e709d1697bb3
Auto-generated-cl: translation import
 2014-07-19 21:42:03 +00:00
Adam Powell
00abaa7407 Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev 2014-07-17 21:09:48 +00:00
Adam Powell
1cd8ce1fb6 Remove obsolete (and large) overscroll drawables 
Bug 16406278

Change-Id: Ic1dd645ce14338f45cd4d62cd89cd02469b983d3
 2014-07-18 18:14:57 -07:00
John Spurlock
a63b497f11 Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev 2014-07-17 19:26:18 +00:00
John Spurlock
6a6641cc4f getMasterStreamType from MUSIC -> NOTIFICATION 
For non-voice-capable devices to follow suit with the new policy.

Bug:15592574
Change-Id: I5de36de5cfe157702bbdf6918df51a98f3f0051a
 2014-07-19 16:21:17 -04:00
Santos Cordon
23d849569d Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev 2014-07-17 19:20:15 +00:00
Santos Cordon
2f42b11d40 InCallService to inherit directly from Service. (1/2) 
Bug: 16416927
Change-Id: I31584556c79e49132c628a0f8f25c372eb4e9b3c
 2014-07-19 13:21:35 -07:00
John Spurlock
335eff4c40 Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
eb1d88ddf9 Non-voice-capable device default stream is now NOTIFICATION. 
Policy change, the volume rocker displayed when nothing else
is going on is now consistent with voice-capable devices.

Bug:15592574
Change-Id: I0f5cb3667b76e1d05286937c702e532f6298ec7c
 2014-07-19 14:55:42 -04:00
Prashant Malani
9353e1a2b2 Merge "Make the booting flag update unconditional" into klp-modular-dev 2014-07-17 18:11:21 +00:00
Robert Ly
f1b18ded01 Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 2014-07-17 18:11:21 +00:00
Jean-Michel Trivi
3d63a9c7cd Merge "Add AudioAttributes to stream type conversion" into lmp-dev 2014-07-17 17:59:02 +00:00
Jean-Michel Trivi
09818c1550 Add AudioAttributes to stream type conversion 
Framework internal conversion for going from an AudioAttributes
 instance to a legacy stream type.

Change-Id: Ic3b7d2cf4aa0ac5255aa5897a25c78c940af9f77
 2014-07-18 17:55:00 -07:00
Ricardo Cervera
cbaecd0f35 am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '9c36b83519804000a3d83e141c3ce7455828b4db':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:18:09 +00:00
Robert Ly
860a6ce6d1 am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ee65b63d257f2318c10b7d5bd6797a54ca65a4cd':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:18:00 +00:00
Prashant Malani
84318e52db am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '162d9433502c05c544ddb10d38f9c4b129a82352':
  Make the booting flag update unconditional
 2014-07-18 23:17:52 +00:00
Jean-Michel Trivi
7cdc0b58d6 Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 2014-07-18 18:24:25 +00:00
Quddus Chong
6120c4c949 am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '9fc983f56af76d1abcbf95e6b3b35e506aa2fddd':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-19 00:42:07 +00:00
Deepanshu Gupta
49847bbeeb am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT ME 
* commit '296459ffbb9600a14be24c2cc06284ac47ea84c4':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:59 +00:00
Deepanshu Gupta
cd92f6a730 am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d6322a527c81fa261642582a508f39a617a206a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:52 +00:00