Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,185 Commits 3 Branches 0 Tags
c54979a970ee5ba6bfaf065adbbb3bc355e8f48e
Commit Graph

195185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
c54979a970 am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 
* commit '844fbff80c72771d21ddabf13de8fe91312c3cd6':
  Fix NPE when requesting outsets for detached view.
 2015-06-03 18:27:14 +00:00
Abodunrinwa Toki
53c3afafb6 am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 
* commit '96e727d1e63a918039ca1b1b1c98ec23ba108247':
  Fix FloatingToolbar positioning for RTL.
 2015-06-03 18:26:52 +00:00
Yohei Yukawa
3145d0f8ce am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 
* commit '168d38aa3c200ea8a823e3faa64345e776e0da31':
  Convert subtypes whose locale is "tl" to "fil".
 2015-06-03 18:26:46 +00:00
Alex Klyubin
68ca9a5e6c am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 
* commit '85f4b7b38cedddfb0ed9f57555fb81aceca786ac':
  Fix block mode numbering (CTR got added as 4 rather than 3)
 2015-06-03 18:26:36 +00:00
Geoff Mendal
bf4de40d26 am 4f31c07f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4f31c07fdd5a9cc442e499d5500924330c2813ae':
  Import translations. DO NOT MERGE
 2015-06-03 18:26:20 +00:00
Geoff Mendal
f09b8343e1 am 8c554b01: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '8c554b015e5c5b7393b5b099ddab046b834f44c9':
  Import translations. DO NOT MERGE
 2015-06-03 18:26:07 +00:00
Geoff Mendal
f17e03fe96 am 48b3a1dc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '48b3a1dc1ca320a39c8adfa99fcbee26ea2a0f62':
  Import translations. DO NOT MERGE
 2015-06-03 18:25:59 +00:00
John Reck
c9c1b3a39e am 2794a798: Merge "Fix warning" into mnc-dev 
* commit '2794a79832418bab30a876535a8da5c0f067ec8f':
  Fix warning
 2015-06-03 18:25:54 +00:00
Arunesh Mishra
3b722d7c45 am 310fe5af: Merge "Use config.xml parameters instead of System properties." into mnc-dev 
* commit '310fe5af672891870dc072965ce8ce2178172003':
  Use config.xml parameters instead of System properties.
 2015-06-03 18:25:49 +00:00
Tyler Gunn
5126afaf87 am bb6d0605: Merge "API Cleanup: Remove VideoState class." into mnc-dev 
* commit 'bb6d06058534d91cfaf98492799de83aee92a851':
  API Cleanup: Remove VideoState class.
 2015-06-03 18:25:42 +00:00
Filip Gruszczynski
844fbff80c Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 2015-06-03 17:50:44 +00:00
Abodunrinwa Toki
96e727d1e6 Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 2015-06-03 17:47:47 +00:00
Filip Gruszczynski
e660d4e96a Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
 2015-06-03 10:43:48 -07:00
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Alex Klyubin
85f4b7b38c Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 17:25:38 +00:00
Geoff Mendal
4f31c07fdd Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 17:22:07 +00:00
Geoff Mendal
8c554b015e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 17:20:09 +00:00
Geoff Mendal
48b3a1dc1c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 17:19:36 +00:00
John Reck
2794a79832 Merge "Fix warning" into mnc-dev 2015-06-03 17:16:47 +00:00
Arunesh Mishra
310fe5af67 Merge "Use config.xml parameters instead of System properties." into mnc-dev 2015-06-03 17:13:55 +00:00
Tyler Gunn
bb6d060585 Merge "API Cleanup: Remove VideoState class." into mnc-dev 2015-06-03 17:13:41 +00:00
Tyler Gunn
87b73f370e API Cleanup: Remove VideoState class. 
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
 2015-06-03 10:09:59 -07:00
Nick Kralevich
326f009272 am 2d63f0a1: Merge "UsbDeviceManager: Don\'t unnecessarily touch properties" into mnc-dev 
* commit '2d63f0a14a450fb23304bfaa639e90fa9fb09e18':
  UsbDeviceManager: Don't unnecessarily touch properties
 2015-06-03 17:05:35 +00:00
Doris Liu
6f060fa8a4 am 8085da8d: Merge "Fix calls to Rect.intersect(Rect)" into mnc-dev 
* commit '8085da8d4cd96931649e9e5376bed2bfc41dac36':
  Fix calls to Rect.intersect(Rect)
 2015-06-03 17:05:31 +00:00
Abodunrinwa Toki
4a5084c58d am 87e949c4: Merge "More FloatingToolbar styles." into mnc-dev 
* commit '87e949c4b836adb7856ca73a585aceaabe79a05f':
  More FloatingToolbar styles.
 2015-06-03 17:05:26 +00:00
Nick Kralevich
2d63f0a14a Merge "UsbDeviceManager: Don't unnecessarily touch properties" into mnc-dev 2015-06-03 16:59:49 +00:00
Geoff Mendal
77100c2094 Import translations. DO NOT MERGE 
Change-Id: I885d3ce3321af31b87a4817037557914d9679a4e
Auto-generated-cl: translation import
 2015-06-03 11:58:05 -05:00
Doris Liu
8085da8d4c Merge "Fix calls to Rect.intersect(Rect)" into mnc-dev 2015-06-03 16:57:46 +00:00
Abodunrinwa Toki
87e949c4b8 Merge "More FloatingToolbar styles." into mnc-dev 2015-06-03 16:54:38 +00:00
John Reck
2a8bb05a31 Fix warning 
Bug: 21608208
Change-Id: I1d1cf1fbc8c0a4561bf76e307c56be580fb4baef
 2015-06-03 09:53:42 -07:00
Geoff Mendal
f806744fce Import translations. DO NOT MERGE 
Change-Id: I7855e24fc4715b1bf7cf978dd40b3bd66f242427
Auto-generated-cl: translation import
 2015-06-03 11:51:22 -05:00
Geoff Mendal
ff1fc4c75b Import translations. DO NOT MERGE 
Change-Id: I8cb4cb369c064d934e671d9ae8086f9d079d79f3
Auto-generated-cl: translation import
 2015-06-03 11:47:54 -05:00
Alex Klyubin
74a525a014 am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 
* commit '5c56f74527d4d5c8c92c95e7e47319d2324bdb4d':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
 2015-06-03 16:47:03 +00:00
Xiaohui Chen
6275e37b9f am 4913211d: Merge "usb debugging: show alert to secondary user" into mnc-dev 
* commit '4913211dbe9f6dbbab75788976465eb2e4c46cd7':
  usb debugging: show alert to secondary user
 2015-06-03 16:46:59 +00:00
Alex Klyubin
4699e43dc6 Fix block mode numbering (CTR got added as 4 rather than 3) 
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
 2015-06-03 09:36:51 -07:00
Alex Klyubin
5c56f74527 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 16:35:21 +00:00
Xiaohui Chen
4913211dbe Merge "usb debugging: show alert to secondary user" into mnc-dev 2015-06-03 16:35:09 +00:00
Yorke Lee
ae84cbd3d9 am ac2e3886: Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev 
* commit 'ac2e3886e3f129b0ee94bb514e026fe72951b4a8':
  Allow default dialer changes and phone account enable/disable via ADB
 2015-06-03 16:33:59 +00:00
John Spurlock
1ef9fb1841 am ad94045e: Merge "Zen: Mute alarm (vibrations) in total silence." into mnc-dev 
* commit 'ad94045eb2da1e917404c88becdcbfa7ad9edf87':
  Zen: Mute alarm (vibrations) in total silence.
 2015-06-03 16:33:52 +00:00
Xiaohui Chen
ffcfe3411f usb debugging: show alert to secondary user 
Bug: 12785423
Change-Id: If7f60899cfdaca7bdad560bd59a78f5be74c24be
 2015-06-03 09:32:19 -07:00
Yorke Lee
ac2e3886e3 Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev 2015-06-03 16:24:17 +00:00
John Spurlock
ad94045eb2 Merge "Zen: Mute alarm (vibrations) in total silence." into mnc-dev 2015-06-03 16:23:33 +00:00
John Spurlock
25d01ee515 Zen: Mute alarm (vibrations) in total silence. 
Bug: 21376328
Change-Id: I00b46e64a0ec8d9b5066b5a9be10fc859dca0126
 2015-06-03 12:18:32 -04:00
John Spurlock
c8fcb5a4b6 am b9f2b4ec: Merge "Volume: Ripple tweaking on zen mode condition rows." into mnc-dev 
* commit 'b9f2b4ec11c690cd9c6c649def92577e547b2a53':
  Volume: Ripple tweaking on zen mode condition rows.
 2015-06-03 16:10:11 +00:00
John Spurlock
b9f2b4ec11 Merge "Volume: Ripple tweaking on zen mode condition rows." into mnc-dev 2015-06-03 16:01:00 +00:00
John Spurlock
9ec8f0607e Volume: Ripple tweaking on zen mode condition rows. 
Bug: 21335622
Change-Id: Ifcd7e5a3c14625e0442dcdb23b9b27a01545953c
 2015-06-03 11:56:08 -04:00
John Spurlock
69c14c416a am dfe80441: Merge "Audio policy: setting explicit non-zero volume unmutes the stream." into mnc-dev 
* commit 'dfe804416014c713df270d94f9c1c0f345eabb84':
  Audio policy: setting explicit non-zero volume unmutes the stream.
 2015-06-03 15:25:06 +00:00
Paul Jensen
1bcc0946b8 am 736432ed: Merge "Disallow going back to initial empty page in captive portal app" into mnc-dev 
* commit '736432edd2bbfd1873b26e987c9ca36470d831d4':
  Disallow going back to initial empty page in captive portal app
 2015-06-03 15:25:01 +00:00
Abodunrinwa Toki
6cb5cc19d4 Fix FloatingToolbar positioning for RTL. 
-The position of the toolbar was forced to the left side in an attempt
to fix an RTL bug. This led to wrong positioning in LTR.
This is now fixed by using a dynamic "show" animation that takes into
consideration already set positions.

-The correct position of the toolbar wasn't recalculated on updates
for RTL. This is now fixed.

Bug:21455067
Change-Id: I0b31a8fd3c95549f5f10133a47a4d3ef27689010
 2015-06-03 16:24:52 +01:00
John Spurlock
dfe8044160 Merge "Audio policy: setting explicit non-zero volume unmutes the stream." into mnc-dev 2015-06-03 15:17:55 +00:00