Andrew Solovay
1d423ea336
am cf300d2f: am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit 'cf300d2f0e6320e530a26c7adeaf1dbd27c694e4':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 18:01:43 +00:00
Jean-Michel Trivi
37152c751c
am 61734857: am 61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev
...
* commit '617348571e4af946e72d2867a3cbb590e01561d9':
AudioAttributes for SoundPool
2014-07-21 18:00:03 +00:00
Andrew Solovay
6f4d821003
am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit '30aa5924f0a372a10c7245a16ee460359826ab9c':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 17:53:30 +00:00
Jean-Michel Trivi
03ed0e8248
am 61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev
...
* commit '61b79634d4cfae4448af6a512cb66488467274de':
AudioAttributes for SoundPool
2014-07-21 17:53:26 +00:00
Deepanshu Gupta
0cd05aaaf6
am db2a5ff1: am 78d85419: Fix missing initial moveto in path definition.
...
* commit 'db2a5ff129bca5eec42fe800d06fd02265255ddd':
Fix missing initial moveto in path definition.
2014-07-21 17:51:14 +00:00
Andrew Solovay
30aa5924f0
am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
...
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
docs: Noted how singleTop affects "up" navigation.
2014-07-21 17:47:13 +00:00
Deepanshu Gupta
99ba6fb978
am 78d85419: Fix missing initial moveto in path definition.
...
* commit '78d8541976f31a018ace165b0e95bab81a136bb3':
Fix missing initial moveto in path definition.
2014-07-21 17:44:47 +00:00
Deepanshu Gupta
3b37956010
Fix missing initial moveto in path definition.
...
The Path_Delegate was missing a moveTo call which resulted in
IllegalPathStateException when rendering the ProgressBar.
Change-Id: Ibdae5f90ffd0a71a3de4ba945238239faa0b18b2
2014-07-21 17:36:45 +00:00
Craig Mautner
0eac9f42d4
am 28d5d4df: am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
...
* commit '28d5d4df0db89ae40ebd83c9973b7583522e5f1c':
Rename flag and attribute per API council
2014-07-21 17:36:04 +00:00
Craig Mautner
e21f15eb50
am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
...
* commit '52cf4df1c333232977b323fd6b0d5f41f3a135eb':
Rename flag and attribute per API council
2014-07-21 17:31:55 +00:00
Ricardo Cervera
991ca20c19
am 2f08e6ea: am f47dab8b: am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit '2f08e6ea7873944e9a647c84ded3d66503ac0c1f':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:24:41 +00:00
Ricardo Cervera
e37501bd5f
am f47dab8b: am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'f47dab8b86224debcebe27b84d4a84b165c9b3eb':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:20:18 +00:00
Ricardo Cervera
e6ab031e3c
am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'fef0011144e2223df382abae412f145c5ea41548':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:15:09 +00:00
Ricardo Cervera
fef0011144
am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:11:42 +00:00
Ricardo Cervera
d73eb7f9c9
am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
...
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
docs: Added note suggesting use of Android Studio over ADT
2014-07-21 17:07:00 +00:00
Derek Sollenberger
51169fa033
am 9a27e8f2: am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
...
* commit '9a27e8f2915f1f367d24fbb0455f7e5b873d74d2':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG
2014-07-21 17:05:30 +00:00
Yorke Lee
488d3f5f4b
am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'b9105f15aa914fcbc10cf414edf2a79ab23c403c':
Add call log entries to all currently running users
2014-07-21 17:05:27 +00:00
Derek Sollenberger
c784ce0fb5
am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
...
* commit '1bf087a904aaa7b4fbd7302600f1cbd98e540855':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG
2014-07-21 17:01:19 +00:00
Yorke Lee
0d6b31426b
am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'ec0197dae050d48b803b803b082d619925306fc0':
Add call log entries to all currently running users
2014-07-21 17:01:15 +00:00
Derek Sollenberger
e1bb46bd7f
am 61cc70a2: am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
...
* commit '61cc70a2c21e32c6e6d0f0c909c85bf8b1095d3e':
Separate Canvas JNI code from the implementation.
2014-07-21 16:49:23 +00:00
Derek Sollenberger
22c0fc66b0
am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
...
* commit '521830a79ba1e56429b31607a4c5af990cd76542':
Separate Canvas JNI code from the implementation.
2014-07-21 16:45:15 +00:00
Robert Ly
c16f3f6354
am d93a4d1b: am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit 'd93a4d1bae3713a518b3b3bc7ddcfe4f22b8994c':
docs: change copy for edu video
2014-07-21 16:30:06 +00:00
Robert Ly
acee769c0b
am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '077d56225b53ef152474e0aed27fe4010139fe01':
docs: change copy for edu video
2014-07-21 16:26:43 +00:00
Robert Ly
fb06b4800c
am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit '205196f128b13eecea2789506341c7ecd2044b71':
docs: change copy for edu video
2014-07-21 16:22:12 +00:00
Robert Ly
205196f128
am efca30d0: am 62c81ab5: docs: change copy for edu video
...
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
docs: change copy for edu video
2014-07-21 16:17:39 +00:00
Robert Ly
efca30d0fa
am 62c81ab5: docs: change copy for edu video
...
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
docs: change copy for edu video
2014-07-21 16:11:39 +00:00
Adrian Roos
3a6bebf38d
am 4f5106e7: am c1c28902: More user switching goodness
...
* commit '4f5106e7a69d2c4893e7b7492948ab377682a8be':
More user switching goodness
2014-07-21 16:09:27 +00:00
Robert Ly
62c81ab580
docs: change copy for edu video
...
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
2014-07-21 09:06:50 -07:00
Adrian Roos
a08d5acf33
am c1c28902: More user switching goodness
...
* commit 'c1c28902038844c608d06692df74b2886d41fc6f':
More user switching goodness
2014-07-21 16:04:49 +00:00
Adrian Roos
5005244f10
More user switching goodness
...
- Confirmation when exiting guest
- Dialog when resuming existing guest session (will be HUNed in follow-up CL)
- Properly center user name in QS user switcher
Bug: 15759638
Bug: 16378966
Change-Id: I63a1dd524975408618c10d90a18052f15deec756
2014-07-21 15:54:03 +00:00
Adam Lesinski
775ded1a91
Merge "Change UsageStatsService to check uses-permission" into lmp-dev
2014-07-21 15:43:35 +00:00
Adam Lesinski
53ab92d890
Change UsageStatsService to check uses-permission
...
Have UsageStatsService check permission grants when AppOps
returns the default MODE_IGNORED mode for a package.
Change-Id: I784a708451a56863b13fc5f178e10bba6ce37a2f
2014-07-21 13:20:25 -07:00
Ricardo Cervera
940ae93043
Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e
docs: Added note suggesting use of Android Studio over ADT
...
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
2014-07-21 09:08:10 -07:00
Alan Viverette
340c98cae8
Merge "Always apply surface insets" into lmp-dev
2014-07-21 15:42:19 +00:00
Alan Viverette
ac89416c77
Always apply surface insets
...
Change-Id: I9d8ad0c7fcf7a1016e01c2332f45614da5d2cf0c
2014-07-21 12:10:30 -07:00
Craig Mautner
2cfeb1ac39
Merge "Don't create a delegate for null callbacks." into lmp-dev
2014-07-21 15:42:19 +00:00
Craig Mautner
3d0c57a1d3
Don't create a delegate for null callbacks.
...
ActivityView does not create callbacks for the VirtualDisplay. This
leads to setting Looper.myLooper() from a Binder thread which
leads to NPE when trying to dereference its message queue.
Fixes bug 16386002.
Change-Id: I12760a22075ed4770f3fe960763e0135fe095cfe
2014-07-21 14:33:47 -07:00
destradaa
facc7bce1b
Merge "Update GPS HAL raw measurements support." into lmp-dev
2014-07-21 15:42:19 +00:00
destradaa
2102dd7255
Update GPS HAL raw measurements support.
...
Align the GPS framework with the GPS HAL
b/16374800
Remove localTime field from API
b/16241708
Update Property containers for measurements to use bit masks
b/16238371
Change-Id: Id4db16c3153d0020bf2edb5a67f59353662762d0
2014-07-21 10:38:12 -07:00
Adam Powell
33a234b3b0
Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev
2014-07-21 15:42:19 +00:00
Andrew Solovay
643fa8d1ec
Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
2014-07-21 15:42:19 +00:00
Craig Mautner
1716baa6d3
Merge "Rename flag and attribute per API council" into lmp-dev
2014-07-21 15:42:19 +00:00
Craig Mautner
7f72f53704
Rename flag and attribute per API council
...
ActivityInfo.DO_NOT_PERSIST => PERSIST_NEVER.
android:persistableMode="doNotPersist" => "persistNever".
Fixes bug 16400594.
Change-Id: I94d25f7d2e3dc453b1251c89bce8c210a65dc331
2014-07-21 10:07:12 -07:00
Craig Mautner
38c1a5f5a9
am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"
...
* commit 'b7bb95b0f3cd8b2ccb61cfa75a586fe1df1be123':
Skip broadcasting to a receiver if the receiver seems to be dead
2014-07-21 15:36:37 +00:00
Craig Mautner
b7bb95b0f3
am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"
...
* commit '02fd104f303cb7d55d6af42be8fe7be543e9aba5':
Skip broadcasting to a receiver if the receiver seems to be dead
2014-07-21 15:31:38 +00:00
Dan Sandler
5854500459
am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '00c3f554f17f0a82f0feca9013de804426c149de':
Defend against null ApplicationInfos.
2014-07-21 13:21:57 +00:00
Dan Sandler
7505947b6c
am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '8bfa8dbccfa178344485450be8b388efcc29d88d':
Defend against null ApplicationInfos.
2014-07-21 13:17:23 +00:00
Dan Sandler
09afc2e4ea
Defend against null ApplicationInfos.
...
Bug: 16303792
Change-Id: Id2d7a70f92718ecda8e3ff418c4e109f6982a75f
2014-07-21 13:11:17 +00:00
Wonsik Kim
f8f1c49e7a
am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev
...
* commit '39ac147e42ccaf1fc5450fc81572231a7e6b3449':
TIF: fix indexOfValue usage
2014-07-21 13:05:03 +00:00