Baligh Uddin
83126ac869
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-04 17:49:04 +00:00
Baligh Uddin
6f6d0af8bb
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-04 17:48:54 +00:00
Chris Wren
e5496543e7
am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev
...
* commit 'c95be445c9a26f125fcca0b44a74da5e8c1d59bb':
Honor per-app sensitivity setting.
2014-09-04 17:45:24 +00:00
RoboErik
bd78c2461c
am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev
...
* commit '11370544c65d0cdbd8d6da86dc70722bcdc5f60c':
Update VolumeProvider apis per feedback
2014-09-04 17:45:20 +00:00
Chris Wren
0fb810a3fa
Merge "Honor per-app sensitivity setting." into lmp-dev
2014-09-04 17:42:18 +00:00
RoboErik
f85a08d30f
Merge "Update VolumeProvider apis per feedback" into lmp-dev
2014-09-04 17:38:01 +00:00
Amith Yamasani
b80e8037e8
am bd1122e6: Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev
...
* commit 'bd1122e6f59d028b7847f2defad53adb1c3c737c':
Allow adb install to work even if unknown sources is disallowed
2014-09-04 17:36:19 +00:00
Yorke Lee
884ffecd86
am 002e85e1: Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev
...
* commit '002e85e1a3ad030bf77f700d545f9a41d7214c74':
Use TelecommManager APIs to detect if we are in a call
2014-09-04 17:36:15 +00:00
Amith Yamasani
dea8e01122
Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev
2014-09-04 17:31:32 +00:00
Yorke Lee
135b59e597
Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev
2014-09-04 17:27:25 +00:00
Brian Carlstrom
4363cab234
am 12799b2f: Used LOCAL_SHARED_LIBRARIES for proper dependencies
...
* commit '12799b2f1a8db1171ff1dd8db99d8de72574738a':
Used LOCAL_SHARED_LIBRARIES for proper dependencies
2014-09-04 17:04:33 +00:00
Brian Carlstrom
191cbad91f
Used LOCAL_SHARED_LIBRARIES for proper dependencies
...
bug:15938254
Change-Id: I710f689e8bcad66988ef3aa0aa189b185c8ad662
2014-09-04 09:52:31 -07:00
Ricardo Cervera
39e9e230af
am 6926b907: am 909cdff4: am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
...
* commit '6926b907b07d02219c5f3bb2beca535245b0630b':
docs: Added SONY logo (hi-res) for Wear site
2014-09-04 16:37:22 +00:00
Ricardo Cervera
2388750612
am 909cdff4: am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
...
* commit '909cdff437ad91ebb0d498389d1a352fca5c8883':
docs: Added SONY logo (hi-res) for Wear site
2014-09-04 16:26:48 +00:00
Wink Saville
a9e0662487
am bfa06279: Merge "Cleanup ISub.aidl" into lmp-dev
...
* commit 'bfa06279cc8240015bd10b8be2748838122c7d11':
Cleanup ISub.aidl
2014-09-04 16:21:29 +00:00
Ricardo Cervera
909cdff437
am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
...
* commit 'c5b5366f1ba236a98cb5aa044b89c6302baf4540':
docs: Added SONY logo (hi-res) for Wear site
2014-09-04 16:16:24 +00:00
Wink Saville
0065e2e62b
Merge "Cleanup ISub.aidl" into lmp-dev
2014-09-04 16:10:17 +00:00
Amith Yamasani
ece305d585
Allow adb install to work even if unknown sources is disallowed
...
adb installs should continue to work for developer usecases,
but PackageInstaller continues to be blocked for sideloading
via the UI - browser, downloads, etc.
Bug: 13760585
Change-Id: I4f8c1445448584c17e5acf77b399579c2643f333
2014-09-04 09:10:10 -07:00
Ricardo Cervera
c5b5366f1b
am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
...
* commit 'ddfe9d11fc11a0e4fafb71703a8212b7671cb354':
docs: Added SONY logo (hi-res) for Wear site
2014-09-04 16:05:25 +00:00
Ricardo Cervera
ddfe9d11fc
docs: Added SONY logo (hi-res) for Wear site
...
Change-Id: I64441072a9f6dbf6eb209c954a43056c19f29551
2014-09-04 08:52:39 -07:00
Chris Wren
3ad4e3a45b
Honor per-app sensitivity setting.
...
Settings are stored by NotificationManagerService in the policy file,
and are communicated to NotificationListeners via a hidden API on the
RankingMap object.
Bug: 16324353
Change-Id: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
2014-09-04 11:49:06 -04:00
Alexandra Gherghina
883d192f86
am 3d23ae9f: Merge "Fix NPE from empty PackageInfo" into lmp-dev
...
* commit '3d23ae9fc413511123b69c6326fb543880653bb0':
Fix NPE from empty PackageInfo
2014-09-04 15:44:37 +00:00
Alexandra Gherghina
0cd0b186c3
Merge "Fix NPE from empty PackageInfo" into lmp-dev
2014-09-04 15:33:50 +00:00
Derek Sollenberger
991464078c
am 5f535ec1: Merge "Remove invalid premul step from HWUI\'s matrix color filter." into lmp-dev
...
* commit '5f535ec1a130062e365f4fd9b7335076f895ecdc':
Remove invalid premul step from HWUI's matrix color filter.
2014-09-04 15:08:52 +00:00
Derek Sollenberger
e23b8dd58f
Merge "Remove invalid premul step from HWUI's matrix color filter." into lmp-dev
2014-09-04 15:01:28 +00:00
Alexandra Gherghina
db811dbc70
Fix NPE from empty PackageInfo
...
Bug: 17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
2014-09-04 15:46:23 +01:00
Winson Chung
fed6cf7fc4
am e9883b8a: Delay in app transition until home animation completes. (Bug 17012456)
...
* commit 'e9883b8a92d72a3cfd947b3ce835bc8e4da2f1b2':
Delay in app transition until home animation completes. (Bug 17012456)
2014-09-04 14:38:21 +00:00
Winson Chung
3884715c45
Delay in app transition until home animation completes. (Bug 17012456)
...
Change-Id: I3469738a70bd872ff03c48c23201d4e0b6c8d8bb
2014-09-04 14:29:38 +00:00
Dan Sandler
adffa67698
am 195fa1ec: Merge "Notification: Limit length of accepted strings" into lmp-dev
...
* commit '195fa1ecb5c0cc50346b8883e775ab131422e778':
Notification: Limit length of accepted strings
2014-09-04 13:46:48 +00:00
Dan Sandler
d2961355bd
Merge "Notification: Limit length of accepted strings" into lmp-dev
2014-09-04 13:36:34 +00:00
Kenny Guy
36babbebc5
am 5c32b77f: Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev
...
* commit '5c32b77f3d356749ad7ea523ec399765929a07bd':
Ensure all RemoteViews use myUserId rather than context.
2014-09-04 13:20:25 +00:00
Kenny Guy
a449018105
Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev
2014-09-04 13:09:32 +00:00
Sander Alewijnse
522b51fc73
am 7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev
...
* commit '7b4dc2726e9352ee0ddfc97591cd39d66a99f60e':
Rename email extra to email bundle key.
2014-09-04 12:05:47 +00:00
Sander Alewijnse
8e31523317
Merge "Rename email extra to email bundle key." into lmp-dev
2014-09-04 11:59:41 +00:00
Kenny Guy
879ebec4e2
Ensure all RemoteViews use myUserId rather than context.
...
Remote views may be inflated in another user so
explicitly use processes user id rather than the
user id of the context.
Bug: 17302505
Change-Id: I985c91745f03dd7e6b2ab6357600077664d8e6be
2014-09-04 12:40:24 +01:00
Kenny Guy
0516957088
am 29ad833b: Merge "Use context for user when calling notifyAsUser" into lmp-dev
...
* commit '29ad833b319d4d403dd26ed0fd73dc07a91c2f44':
Use context for user when calling notifyAsUser
2014-09-04 11:31:26 +00:00
Sander Alewijnse
aff9f4cb88
Rename email extra to email bundle key.
...
Bug:17197410
Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
2014-09-04 12:28:52 +01:00
Kenny Guy
4c4e796444
Merge "Use context for user when calling notifyAsUser" into lmp-dev
2014-09-04 11:23:53 +00:00
Deepanshu Gupta
08c79f8309
am 90154b23: am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
...
* commit '90154b239a5bc0d48238a6fb16339f5b5150e585':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 06:47:20 +00:00
Deepanshu Gupta
18ed49419c
am 0f6746e3: am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '0f6746e36713cedda18fe0ff3d7b2daa78835e06':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 06:47:17 +00:00
Deepanshu Gupta
ae62d71d36
am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
...
* commit '7f26655a5bcaa8a6273ed603a465090d0e434d07':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 06:37:17 +00:00
Deepanshu Gupta
16099eed0f
am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '84268142a64d463453556588bd4f7092af31fae9':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 06:37:13 +00:00
Deepanshu Gupta
7f26655a5b
am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
...
* commit 'a4d978668219572b71538dc98dab461fe99dfcc3':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 06:26:25 +00:00
Deepanshu Gupta
84268142a6
am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'ccd53eecb946ad8d08fb332f0159db4816e62604':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 06:26:21 +00:00
Deepanshu Gupta
a4d9786682
am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
...
* commit '2d70a5a9d1556f269b8ed79b1f6a896ce8241b51':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 06:16:36 +00:00
Deepanshu Gupta
ccd53eecb9
am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '6a6e63a0efed47fea0b1f080a3092d7931941851':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 06:16:32 +00:00
Deepanshu Gupta
2d70a5a9d1
am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
...
* commit '06a31255133bcc21ed2f1d821b5e120fefddc117':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 06:07:21 +00:00
Deepanshu Gupta
6a6e63a0ef
am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '80b901611008824ff897f5434a840680b1ae40d5':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 06:07:18 +00:00
Deepanshu Gupta
06a3125513
am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
...
* commit '3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:56:35 +00:00
Deepanshu Gupta
80b9016110
am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'b14ab8d402ac3b001601492d9f989e54f761cc2e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:56:32 +00:00