OSDN Git Service
Adrian Roos [Tue, 12 May 2015 21:19:22 +0000 (21:19 +0000)]
am
2b0eaffc: Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev
* commit '
2b0eaffc6264abb4162c089adf7089b4cfee5719':
Hide lockscreen contents from a11y while bouncer is showing
Jorim Jaggi [Tue, 12 May 2015 21:19:16 +0000 (21:19 +0000)]
am
5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
* commit '
5be4d295c08614eaf8afd012f90e5c7726bc293e':
Only enable fingerprint auth after first regular auth
John Spurlock [Tue, 12 May 2015 21:19:11 +0000 (21:19 +0000)]
am
d5304020: Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev
* commit '
d5304020b29762ce79d66c1ed3028b0ee30c68ad':
Volume A11y: Prevent auto-dismiss when feedback enabled.
Hiroshi Yamauchi [Tue, 12 May 2015 21:19:06 +0000 (21:19 +0000)]
am
95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev
* commit '
95e6c78f3f71850931f69fc562f68e0c46430981':
Fix binder force gc will block binder thread
Prabhakar Thirumoorthy [Tue, 12 May 2015 21:18:58 +0000 (21:18 +0000)]
am
5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev
* commit '
5b402fd8963e4700973597650b6992444ff8ffdd':
Update permissions on memory usage instrumentation
Ben Kwa [Tue, 12 May 2015 21:18:34 +0000 (21:18 +0000)]
am
efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from DO NOT MERGE" into mnc-dev
* commit '
efb70fd8a0a37ddd08356120fb63ff62694eaea0':
Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE
Andrew Solovay [Tue, 12 May 2015 21:17:58 +0000 (21:17 +0000)]
am
d5fb9cac: am
a4d0e528: am
d8039f04: am
79167534: am
c1174104: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
d5fb9cac87d65d59e9d2c0fa4242fb6eeb4edf6d':
Harish Mahendrakar [Tue, 12 May 2015 21:17:48 +0000 (21:17 +0000)]
am
34265cd9: media: Added MPEG2 profile/levels and tests
* commit '
34265cd94f76cc18648c310e4f120d280bf3a0a4':
media: Added MPEG2 profile/levels and tests
Tony Mantler [Tue, 12 May 2015 21:17:37 +0000 (21:17 +0000)]
am
def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted" into mnc-dev
* commit '
def4c0c49aeebccbb42d9b82901a7de81782baad':
Don't crash in StorageMeasurement if volume isn't mounted
Yang Ni [Tue, 12 May 2015 21:17:25 +0000 (21:17 +0000)]
am
102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev
* commit '
102badf834256e209e1a5f58fde1d67b8fd5ac0b':
Sanity checks in JNI code for closure creation
Raph Levien [Tue, 12 May 2015 21:17:17 +0000 (21:17 +0000)]
am
be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
* commit '
be8db119726a229ca687b99fcdb8a6a959648cd1':
Fix NPE in Html.inParagraph()
Julia Reynolds [Tue, 12 May 2015 21:16:55 +0000 (21:16 +0000)]
am
9e540a51: Merge "Fixing docs." into mnc-dev
* commit '
9e540a512281560a9b4ffc0edbe68cddaf9bc3b4':
Fixing docs.
Yorke Lee [Tue, 12 May 2015 21:16:42 +0000 (21:16 +0000)]
am
1542179b: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev
* commit '
1542179bd2bc82db31a925550b47151cf579c767':
Add hidden methods to set/get default dialer across users
John Reck [Tue, 12 May 2015 21:16:33 +0000 (21:16 +0000)]
am
fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev
* commit '
fe2f7e31be01c8c0ebcbdfb1ff8ae420f24c0ac2':
Add some basic DA unit tests
Casper Bonde [Tue, 12 May 2015 21:15:59 +0000 (21:15 +0000)]
am
424681e4: Settings UI for SIM access profile (2/2)
* commit '
424681e43e454bfcbceb863ddccb875ea57ec26f':
Settings UI for SIM access profile (2/2)
Alan Viverette [Tue, 12 May 2015 21:15:30 +0000 (21:15 +0000)]
am
261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
* commit '
261208e002775fe9a9f4e79e9f70b41852cfbe60':
Add API for obtaining changing configurations bitmask from Theme
Jean-Michel Trivi [Tue, 12 May 2015 21:14:52 +0000 (21:14 +0000)]
am
28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
* commit '
28a516280a59a81aeecbf4a68057019d59feb872':
AudioRecord JNI: use default UID / PID
Todd Kennedy [Tue, 12 May 2015 21:14:42 +0000 (21:14 +0000)]
am
3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
* commit '
3266f60ba0c2a37883446cadbfc00bb8354824d0':
Call Activity#onAttachFragment()
Kenny Guy [Tue, 12 May 2015 21:14:27 +0000 (21:14 +0000)]
am
e02b7868: Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev
* commit '
e02b7868c6c8f856a21f36569a77dab7f1cc7c78':
Call profile changed in cases were focused activity is nulled.
Svet Ganov [Tue, 12 May 2015 21:14:06 +0000 (21:14 +0000)]
am
4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
* commit '
4a64b19f239b6bff82a032329ce5781681843044':
Permission UI - legacy apps support
John Reck [Tue, 12 May 2015 21:13:44 +0000 (21:13 +0000)]
am
c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev
* commit '
c64b3fab95cff6f33cba524f1b9c540cfb75c73b':
Attempt to solve the double-GC problem
John Spurlock [Tue, 12 May 2015 21:13:34 +0000 (21:13 +0000)]
am
0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
* commit '
0bc8afff7eb3b5af72b7e9a4ce3954488bfbecd0':
Zen: Remove calendar rule attendance attribute.
Seigo Nonaka [Tue, 12 May 2015 21:12:54 +0000 (21:12 +0000)]
am
d4474cb9: Remove dead code from IMMS.
* commit '
d4474cb9454c7a8b907c0be07236ffed4ecf3fd8':
Remove dead code from IMMS.
Dirk Dougherty [Tue, 12 May 2015 21:12:44 +0000 (21:12 +0000)]
am
08e474ca: am
08c72b91: am
ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
* commit '
08e474ca24c024be29ed8a593cbd2748abde44ce':
Doc change: merge landing page and header/footer designs.
Rich Slogar [Tue, 12 May 2015 21:11:46 +0000 (21:11 +0000)]
am
703b5f89: am
2f626153: am
39220a7e: am
023901c6: am
ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
* commit '
703b5f895d8be08d795ace72c74576e1e4b6c5b6':
docs: Update Eclipse migrate procedure
Andrew Solovay [Tue, 12 May 2015 21:11:39 +0000 (21:11 +0000)]
am
3e51aa39: am
168bbcef: am
65241c66: am
9ceea140: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
3e51aa39818e896d8ada9820ebb4c4bc30d81e57':
Docs: New swipe-to-refresh training guide.
Prerepa Viswanadham [Tue, 12 May 2015 21:11:08 +0000 (21:11 +0000)]
am
d1808401: Merge changes from topic \'mwd-merge-050415\' into mnc-dev
* commit '
d1808401ca3bfd6b6b9a975c1e739b194d18f849': (62 commits)
Clarifying which receiver method to call.
SystemUI strings: prospective VPN strings for apps
Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Adjust display inversion matrix to account for luminance
Import translations. DO NOT MERGE
Add a libbase static depedency for aapt2.
Add a libbase static depedency for aapt2.
Add a static dependency on libbase.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix build
Properly describe exception
Expand the notification panel by Meta-N.
DO NOT MERGE - Make sure to return network type after conversion
DO NOT MERGE - Radio Access Family related fixes
DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same.
Fix incorrect getType signature/implementation in doc.
Add plumbing for merge failures and renable button. (3/4)
Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
...
Fabrice Di Meglio [Tue, 12 May 2015 21:07:37 +0000 (21:07 +0000)]
am
44b60be1: Merge "Add user selectable Default Browser feature - part 5" into mnc-dev
* commit '
44b60be189183138437a3faf9a73388af0efcf44':
Add user selectable Default Browser feature - part 5
Adam Lesinski [Tue, 12 May 2015 21:07:30 +0000 (21:07 +0000)]
am
5b151690: Merge "AAPT2: Add option to generate static library" into mnc-dev
* commit '
5b1516900ac23fbbc32c3fee36009e1dd3569dcd':
AAPT2: Add option to generate static library
Adam Lesinski [Tue, 12 May 2015 21:07:22 +0000 (21:07 +0000)]
am
f713aa2f: Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev
* commit '
f713aa2f10ea01fab302536a87bd0521b915cb05':
AAPT2: Include package name of attributes in styleable from another package
Adam Lesinski [Tue, 12 May 2015 21:07:13 +0000 (21:07 +0000)]
am
247bc95c: Merge "AAPT2: Record public status in a more robust way" into mnc-dev
* commit '
247bc95cb31c6f7e56814818dc29aa1eb8512e6c':
AAPT2: Record public status in a more robust way
Adam Lesinski [Tue, 12 May 2015 21:06:59 +0000 (21:06 +0000)]
am
2f519532: Merge "Add namespace handling in attribute values" into mnc-dev
* commit '
2f519532eecd881b034a4e31f57336724604cb56':
Add namespace handling in attribute values
Jorim Jaggi [Tue, 12 May 2015 21:06:40 +0000 (21:06 +0000)]
am
f31a7003: Merge "Update emergency call button label when language changes" into mnc-dev
* commit '
f31a7003643988c7e2682a4f9256a28b04877035':
Update emergency call button label when language changes
Robert Shih [Tue, 12 May 2015 21:06:18 +0000 (21:06 +0000)]
am
5eac1da3: Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev
* commit '
5eac1da3bbd513f6b5204454afa09c8d6c3c9c06':
MediaPlayer: setSubtitleAnchor on a HandlerThread
Jorim Jaggi [Tue, 12 May 2015 21:05:56 +0000 (21:05 +0000)]
am
9f74303e: Track unlock attempts per user.
* commit '
9f74303eb8432aa64a7030f58ab0c3279a20c53e':
Track unlock attempts per user.
Andre Eisenbach [Tue, 12 May 2015 21:05:37 +0000 (21:05 +0000)]
am
ab258139: BluetoothSap class should not be public
* commit '
ab2581398c812917145088590bd18eb83f3a2ea6':
BluetoothSap class should not be public
Wei Jia [Tue, 12 May 2015 21:05:20 +0000 (21:05 +0000)]
am
73b4a330: Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev
* commit '
73b4a3303ed97860d4a4c0795afd680aa5158d4e':
MediaSync: clean up configureAudioTrack and configureSurface.
Joe Fernandez [Tue, 12 May 2015 21:05:11 +0000 (21:05 +0000)]
am
2dc05e22: am
722b509d: am
a246d2dd: am
9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
* commit '
2dc05e22bdbebe3f276391a743f525b0e1a2504e':
docs: Android Developer Dashboard update - May 2015
Rich Slogar [Tue, 12 May 2015 21:05:02 +0000 (21:05 +0000)]
Dirk Dougherty [Tue, 12 May 2015 21:04:50 +0000 (21:04 +0000)]
am
41ef6ba4: am
fd92db9c: am
35219b7d: am
b42c5f80: Update N6 device art port image to remove shadow.
* commit '
41ef6ba4ce330718c71db503788943067b5b62a9':
Update N6 device art port image to remove shadow.
Rich Slogar [Tue, 12 May 2015 21:04:40 +0000 (21:04 +0000)]
am
d5aa39cc: am
5bf92cba: am
ffac3c82: am
67a05f0c: am
e7bfe5b3: docs: sdk 24.2.0 revisions
* commit '
d5aa39cc0aab9b6175ebafd87eed6894ac4d949f':
docs: sdk 24.2.0 revisions
Joe Fernandez [Tue, 12 May 2015 21:04:29 +0000 (21:04 +0000)]
am
ed4331d2: am
419aff0f: am
ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs
* commit '
ed4331d29a63b30293bb2176712c491c65190623':
docs: M Preview mini site skeleton
George Mount [Tue, 12 May 2015 21:04:09 +0000 (21:04 +0000)]
am
57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev
* commit '
57436d3f7e7fca99400a9b90e93491e892d135ae':
Fix potential NPE in internal isValidTarget method.
Andre Eisenbach [Tue, 12 May 2015 21:03:56 +0000 (21:03 +0000)]
am
f455986a: Add documentation for BluetoothSocket.getConnectionType()
* commit '
f455986a45328614c8dd07a4d60a30b9ddc3d994':
Add documentation for BluetoothSocket.getConnectionType()
George Mount [Tue, 12 May 2015 21:03:47 +0000 (21:03 +0000)]
am
c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev
* commit '
c81af1ca7838f79ecc39fe0a9bf269880fa515e5':
When returning, transition only existing shared elements.
Chris Wren [Tue, 12 May 2015 21:03:39 +0000 (21:03 +0000)]
am
0425de31: Merge "eliminate notification clicker garbage." into mnc-dev
* commit '
0425de31cf9a2ad8e5883c64d27dc2ee90d0377c':
eliminate notification clicker garbage.
Sanket Padawe [Tue, 12 May 2015 21:03:30 +0000 (21:03 +0000)]
am
5c33a2e3: Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev
* commit '
5c33a2e3ecf3c495e00614029df917e0754d7397':
Adding "Connected, no Internet" string in Wifi nw summary.
George Mount [Tue, 12 May 2015 21:03:20 +0000 (21:03 +0000)]
am
61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev
* commit '
61bab469a1529ef61cadb870ca4cc533a5510cfb':
Fix Visibility not changing until Animator ends.
Alan Viverette [Tue, 12 May 2015 21:03:11 +0000 (21:03 +0000)]
am
394f9360: Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev
* commit '
394f9360c91c588fb1630f2d6af65fabe4c241a6':
More documentation for handling RippleDrawable mask at run time
Fabrice Di Meglio [Tue, 12 May 2015 21:03:02 +0000 (21:03 +0000)]
am
8ef631de: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev
* commit '
8ef631de47d4e52cafe5f9182633892b480dfcdb':
Add user selectable Default Browser feature - part 4
Alan Viverette [Tue, 12 May 2015 21:02:54 +0000 (21:02 +0000)]
am
d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev
* commit '
d38d3574d0b1905d41891c2d7f89892ab13803ae':
Always force constructors accessible during inflation
John Spurlock [Tue, 12 May 2015 21:02:45 +0000 (21:02 +0000)]
am
ad2399f3: Merge "Zen: Implement calendar event system condition provider." into mnc-dev
* commit '
ad2399f3be4861d0f5acf072460d98fafc951c57':
Zen: Implement calendar event system condition provider.
Jeff Sharkey [Tue, 12 May 2015 21:02:38 +0000 (21:02 +0000)]
am
5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev
* commit '
5f809e3fff2b4c6c94d966ceb93e6cf74fe9813b':
Avoid NPE when fsUuid is null.
John Reck [Tue, 12 May 2015 21:02:23 +0000 (21:02 +0000)]
am
e678b41c: Merge "Fix setName use-after-free" into mnc-dev
* commit '
e678b41cdb56847c094260607ea39aea4abb808e':
Fix setName use-after-free
Jose Lima [Tue, 12 May 2015 21:02:05 +0000 (21:02 +0000)]
am
5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
* commit '
5551aca2b8ec9fe7ab5ffda8dad82ee104556962':
Move ContentInfoExtender from Notification.java to a support library
Steve McKay [Tue, 12 May 2015 21:01:55 +0000 (21:01 +0000)]
am
5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev
* commit '
5d2c1d54b953ac0e4243210237fec92e3105844e':
Ensure sort menu is shown as needed.
Geoff Mendal [Tue, 12 May 2015 21:01:47 +0000 (21:01 +0000)]
am
cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
Import translations. DO NOT MERGE
Adrian Roos [Tue, 5 May 2015 21:05:33 +0000 (21:05 +0000)]
Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev
Jorim Jaggi [Tue, 5 May 2015 20:51:17 +0000 (20:51 +0000)]
Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
John Spurlock [Tue, 5 May 2015 20:43:53 +0000 (20:43 +0000)]
Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev
Hiroshi Yamauchi [Tue, 5 May 2015 20:31:40 +0000 (20:31 +0000)]
Merge "Fix binder force gc will block binder thread" into mnc-dev
Prabhakar Thirumoorthy [Tue, 5 May 2015 20:06:50 +0000 (20:06 +0000)]
Merge "Update permissions on memory usage instrumentation" into mnc-dev
Hiroshi Yamauchi [Tue, 5 May 2015 19:15:26 +0000 (12:15 -0700)]
Fix binder force gc will block binder thread
Symptom: Force gc caused activity launch time took longer
Root Cause: Runtime.getRuntime().gc will block binder thread
Solution: Use VMRuntime.requestConcurrentGC() will not block binder
thread
(cherry pick commit
d916c233f0ed615667c1c2338c779e819098d135)
Bug:
20554807
Change-Id: Ia9fecea51d2b0a6635e037b5f2bfcb8eb87f4103
Maxim Siniavine [Tue, 5 May 2015 19:00:24 +0000 (12:00 -0700)]
Update permissions on memory usage instrumentation
Change-Id: I0c2bbd893252eb1dc3cf8b93b787efd772317216
Ben Kwa [Tue, 5 May 2015 18:54:04 +0000 (18:54 +0000)]
Merge "Cherry pick beefed-up error handling in the CopyService from DO NOT MERGE" into mnc-dev
John Spurlock [Tue, 5 May 2015 18:50:43 +0000 (14:50 -0400)]
Volume A11y: Prevent auto-dismiss when feedback enabled.
- Prevent the volume dialog from timing out when feedback is enabled.
- Use the a11y events as an additional user activity signal.
- Add content descriptions for the dialog icon buttons.
Bug:
20172022
Change-Id: Id5cd29d9cee27fded2fc8a029913cfcc2b68c152
Jorim Jaggi [Fri, 1 May 2015 21:28:49 +0000 (14:28 -0700)]
Only enable fingerprint auth after first regular auth
- Add method hasUserAuthenticatedSinceBoot to TrustManagerService
- Use this information to only enable fingerprint auth after the user
has at least once authenticated with his regular authentication
method.
Change-Id: Icf073ac3b340d557b044f6bf27f1a7f8511048e2
Andrew Solovay [Tue, 5 May 2015 18:25:05 +0000 (18:25 +0000)]
am
a4d0e528: am
d8039f04: am
79167534: am
c1174104: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
a4d0e5282c83391c830c8bff2cb138214f5bfe79':
Andrew Solovay [Tue, 5 May 2015 18:15:35 +0000 (18:15 +0000)]
am
d8039f04: am
79167534: am
c1174104: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
d8039f048db26847a3da5367a0b69e2bd3f340e0':
Harish Mahendrakar [Sat, 18 Apr 2015 04:34:39 +0000 (10:04 +0530)]
media: Added MPEG2 profile/levels and tests
Bug:
20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
Andrew Solovay [Tue, 5 May 2015 18:01:14 +0000 (18:01 +0000)]
am
79167534: am
c1174104: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
7916753474be29f117d2f31dc4c6bc76ff76b92f':
Docs: New swipe-to-refresh training guide.
Tony Mantler [Tue, 5 May 2015 17:59:00 +0000 (17:59 +0000)]
Merge "Don't crash in StorageMeasurement if volume isn't mounted" into mnc-dev
Yang Ni [Tue, 5 May 2015 17:48:52 +0000 (17:48 +0000)]
Merge "Sanity checks in JNI code for closure creation" into mnc-dev
Raph Levien [Tue, 5 May 2015 17:43:27 +0000 (17:43 +0000)]
Merge "Fix NPE in Html.inParagraph()" into mnc-dev
Julia Reynolds [Tue, 5 May 2015 17:24:32 +0000 (17:24 +0000)]
Merge "Fixing docs." into mnc-dev
Julia Reynolds [Tue, 5 May 2015 15:44:20 +0000 (11:44 -0400)]
Fixing docs.
Bug:
20823970
Bug:
20820224
Change-Id: If6b5c43ae5cf88bd5a09adc60c1204ba9e6ab459
Yorke Lee [Tue, 5 May 2015 17:15:13 +0000 (17:15 +0000)]
Merge "Add hidden methods to set/get default dialer across users" into mnc-dev
Raph Levien [Tue, 5 May 2015 17:13:54 +0000 (10:13 -0700)]
Fix NPE in Html.inParagraph()
The typeface in a TypefaceSpan can be the null string. This patch
fixes the string comparison to not throw a NullPointerException.
Bug:
20849738
Change-Id: Ied049305794966bcbca00cfd11fe97a91b685d79
John Reck [Tue, 5 May 2015 17:12:00 +0000 (17:12 +0000)]
Merge "Add some basic DA unit tests" into mnc-dev
John Reck [Tue, 5 May 2015 15:38:36 +0000 (08:38 -0700)]
Add some basic DA unit tests
Change-Id: I01e32a8f0db34a27672010cea275de32d7500dd7
Casper Bonde [Tue, 5 May 2015 05:07:45 +0000 (22:07 -0700)]
Settings UI for SIM access profile (2/2)
Change-Id: I2e44a858ee3f3349baa401ee7002186d3ae19412
Alan Viverette [Tue, 5 May 2015 16:50:27 +0000 (16:50 +0000)]
Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
Alan Viverette [Tue, 5 May 2015 16:49:03 +0000 (09:49 -0700)]
Add API for obtaining changing configurations bitmask from Theme
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.
Bug:
20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
Jean-Michel Trivi [Tue, 5 May 2015 15:55:07 +0000 (15:55 +0000)]
Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
Todd Kennedy [Tue, 5 May 2015 15:53:27 +0000 (15:53 +0000)]
Merge "Call Activity#onAttachFragment()" into mnc-dev
Kenny Guy [Tue, 5 May 2015 15:36:49 +0000 (15:36 +0000)]
Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev
Svet Ganov [Tue, 5 May 2015 15:34:08 +0000 (15:34 +0000)]
Merge "Permission UI - legacy apps support" into mnc-dev
Svet Ganov [Mon, 4 May 2015 18:07:38 +0000 (11:07 -0700)]
Permission UI - legacy apps support
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
John Reck [Tue, 5 May 2015 14:50:48 +0000 (14:50 +0000)]
Merge "Attempt to solve the double-GC problem" into mnc-dev
John Spurlock [Tue, 5 May 2015 14:42:01 +0000 (14:42 +0000)]
Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
John Spurlock [Tue, 5 May 2015 13:49:32 +0000 (09:49 -0400)]
Zen: Remove calendar rule attendance attribute.
- No longer supporting a filter based on attendance type.
- Remove from model + condition provider logic.
Bug:
20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05
Seigo Nonaka [Mon, 4 May 2015 23:53:24 +0000 (16:53 -0700)]
Remove dead code from IMMS.
MSG_SHOW_IM_PICKER is no longer used. Also by removing that message, we
can simplify showInputMethodMenu/showINputMethodSubtypeMenu.
Change-Id: I7002ff063e490928309e9a9a0f6557ce3d12e6aa
Dirk Dougherty [Tue, 5 May 2015 02:46:40 +0000 (02:46 +0000)]
am
08c72b91: am
ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
* commit '
08c72b91bedefbebe0547646544cd875c1062af0':
Doc change: merge landing page and header/footer designs.
Dirk Dougherty [Tue, 5 May 2015 02:34:51 +0000 (02:34 +0000)]
am
ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
* commit '
ecfed34d3e71bfceae11493b8441a051e803ec05':
Doc change: merge landing page and header/footer designs.
Dirk Dougherty [Tue, 5 May 2015 02:27:46 +0000 (02:27 +0000)]
Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
Jean-Michel Trivi [Sat, 2 May 2015 01:48:29 +0000 (18:48 -0700)]
AudioRecord JNI: use default UID / PID
Bug
20832981
Change-Id: I887e38a4e95c9f4b9360f831b3dfc0073d151706
Rich Slogar [Tue, 5 May 2015 01:48:06 +0000 (01:48 +0000)]
am
2f626153: am
39220a7e: am
023901c6: am
ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
* commit '
2f6261534b0916714715ffa9e2800716dd900eb8':
docs: Update Eclipse migrate procedure
Andrew Solovay [Tue, 5 May 2015 01:48:00 +0000 (01:48 +0000)]
am
168bbcef: am
65241c66: am
9ceea140: am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
168bbcef02603b35b9fad53d923310b9a80acb5b':
Docs: New swipe-to-refresh training guide.
Prerepa Viswanadham [Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)]
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
Merge commit '
b6f59f4' into master_merge
Merge commit '
f6db0ce' into master_merge
Merge commit '
17455a3' into master_merge
Merge commit '
b4d5b32' into master_merge
Merge commit '
a1a2fa7' into master_merge
Merge commit '
8dfdb98' into master_merge
Merge commit '
eba66c3' into master_merge
Rich Slogar [Tue, 5 May 2015 00:59:34 +0000 (00:59 +0000)]
am
39220a7e: am
023901c6: am
ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
* commit '
39220a7e924e659dffccd94ea7680f3ef8ac14b6':
docs: Update Eclipse migrate procedure