Dianne Hackborn
c8911ddd48
am 373a2f15: am 607b414d: Add new app ops method to reset all op modes.
...
* commit '373a2f15667956ff8a00ba59b42972b9c930af92':
Add new app ops method to reset all op modes.
2013-08-02 19:32:13 -07:00
Dianne Hackborn
373a2f1566
am 607b414d: Add new app ops method to reset all op modes.
...
* commit '607b414d0444067e166fa54d8ea37563f2715ea3':
Add new app ops method to reset all op modes.
2013-08-02 19:30:08 -07:00
Dianne Hackborn
607b414d04
Add new app ops method to reset all op modes.
...
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
2013-08-02 19:06:25 -07:00
Jean-Baptiste Queru
ae311f4c5f
am 17548b3c: Revert "be more robust with handling unknown sensors"
...
* commit '17548b3c70fe4f29d33367a61300f5323f5efe99':
Revert "be more robust with handling unknown sensors"
2013-08-02 17:42:02 -07:00
Jean-Baptiste Queru
d07347eddb
am 83485dc9: Merge "be more robust with handling unknown sensors"
...
* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
be more robust with handling unknown sensors
2013-08-02 17:41:59 -07:00
Elliott Hughes
710f3e2cc6
am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
...
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
If frameworks wants ASCII casing, it should explicity ask for it.
2013-08-02 17:41:57 -07:00
Elliott Hughes
b56f10aa66
am 32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it."
...
* commit '32c308a5f2051a62ab2fb3337d00d84e9035eb9a':
If media wants ASCII lowercasing, it needs to ask for it.
2013-08-02 17:41:54 -07:00
Dirk Dougherty
966dc871ca
am 780795dc: am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
...
* commit '780795dc198c05d5a1a181c58317dc6befec861d':
Doc change: refresh GCM reference docs.
2013-08-02 17:41:05 -07:00
Scott Main
24a32c98a5
am e0a85960: am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
...
* commit 'e0a8596020a10c1cf6347d89fea862d41629db04':
docs: OpenGL Training sample code fixes
2013-08-02 17:41:02 -07:00
Dirk Dougherty
780795dc19
am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
...
* commit 'b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
Doc change: refresh GCM reference docs.
2013-08-02 17:38:31 -07:00
Scott Main
e0a8596020
am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
...
* commit '9a0087f22754de40cd5be2a738600f9642a611cc':
docs: OpenGL Training sample code fixes
2013-08-02 17:38:28 -07:00
Jean-Baptiste Queru
17548b3c70
Revert "be more robust with handling unknown sensors"
...
This reverts commit 80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
2013-08-02 17:31:54 -07:00
Jean-Baptiste Queru
83485dc920
Merge "be more robust with handling unknown sensors"
2013-08-03 00:13:24 +00:00
Dirk Dougherty
b6cb0437ef
Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
2013-08-02 22:49:11 +00:00
Scott Main
9a0087f227
Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
2013-08-02 22:27:14 +00:00
Elliott Hughes
60ae2617b4
Merge "If frameworks wants ASCII casing, it should explicity ask for it."
2013-08-02 22:13:07 +00:00
Elliott Hughes
cb64d43062
If frameworks wants ASCII casing, it should explicity ask for it.
...
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
2013-08-02 15:12:32 -07:00
Scott Main
efd288a261
am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
...
* commit '2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
add note to use "480" instead of "xxhdpi" (this should be temporary)
2013-08-02 14:29:09 -07:00
Scott Main
2a6666207d
am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
...
* commit '1f19690322523d5a28051c55353735513638ca39':
add note to use "480" instead of "xxhdpi" (this should be temporary)
2013-08-02 14:27:40 -07:00
Scott Main
1f19690322
Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
2013-08-02 21:23:55 +00:00
Joe Fernandez
ab1f29d935
docs: OpenGL Training sample code fixes
...
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit 6da22f88434543e8796e0151f4bb11d74c16e847)
2013-08-02 20:57:03 +00:00
Mathias Agopian
80ba0a6bae
be more robust with handling unknown sensors
...
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up
Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-08-02 13:49:41 -07:00
Dave Burke
0eab98dd24
am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
...
* commit '019f4385d17234324db23521149e1f1cb6d7d061':
Revert "Add version identifier to app ops."
2013-08-02 13:42:03 -07:00
Dave Burke
019f4385d1
am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
...
* commit '7925e7cc089251afb2faceb3e81eea436647c572':
Revert "Add version identifier to app ops."
2013-08-02 13:39:12 -07:00
Dave Burke
7925e7cc08
Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
2013-08-02 20:36:28 +00:00
Dave Burke
0997c5bd79
Revert "Add version identifier to app ops."
...
This reverts commit 483a6bbfc118409b9c46b226cf0aa6afdc4d9159.
Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
2013-08-02 20:25:02 +00:00
Scott Main
d53f8abcf5
add note to use "480" instead of "xxhdpi" (this should be temporary)
...
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
2013-08-02 12:56:43 -07:00
Elliott Hughes
32c308a5f2
Merge "If media wants ASCII lowercasing, it needs to ask for it."
2013-08-02 17:24:41 +00:00
Elliott Hughes
dcb1a58cf9
If media wants ASCII lowercasing, it needs to ask for it.
...
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
2013-08-02 10:03:53 -07:00
Elliott Hughes
5d6b7db5d9
am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
...
* commit '20c911ba071957ff5907d9a7854e7eab1cdaf907':
When wifi wants ASCII lowercasing, it needs to ask for it.
2013-08-02 09:46:04 -07:00
Elliott Hughes
20c911ba07
Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
2013-08-02 16:39:59 +00:00
Elliott Hughes
ee00b353a4
When wifi wants ASCII lowercasing, it needs to ask for it.
...
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
2013-08-02 09:07:54 -07:00
Dirk Dougherty
882ecced5e
Doc change: refresh GCM reference docs.
...
Change-Id: I4f79e27b9d761cb8967fb90ff8df5438e43cd39c
2013-08-01 16:15:21 -07:00
Scott Main
a5da186523
am 9210aea5: am 218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
...
* commit '9210aea5accb872527ba1d54ba0760340ad8f1ba':
dashboard update for 8/1
2013-08-01 15:58:53 -07:00
Scott Main
9210aea5ac
am 218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
...
* commit '218120e0795bc4aee1b29a43da25a8ea7e8edf71':
dashboard update for 8/1
2013-08-01 15:57:08 -07:00
Scott Main
218120e079
Merge "dashboard update for 8/1" into jb-mr2-docs
2013-08-01 22:54:06 +00:00
Scott Main
bf03f391ba
dashboard update for 8/1
...
Change-Id: I8541646e13d20186f79dd8a548b1ff21602793b6
2013-08-01 15:49:20 -07:00
Scott Main
54403d8a27
am f5ad5b26: am 8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs
...
* commit 'f5ad5b2635d0a46c9a3e09543431a73e915ba4c6':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221
2013-08-01 15:42:54 -07:00
Scott Main
f5ad5b2635
am 8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs
...
* commit '8709fb2a7175faa3b53cec7869f4b7594371b882':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221
2013-08-01 15:39:19 -07:00
Scott Main
8709fb2a71
Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs
2013-08-01 22:36:03 +00:00
Scott Main
eb461f9e5b
am 0e687767: am f0e0cf4e: fix toc link
...
* commit '0e6877678665eed45be77a8aa118a67f95e55c9e':
fix toc link
2013-08-01 15:25:55 -07:00
Scott Main
0e68776786
am f0e0cf4e: fix toc link
...
* commit 'f0e0cf4e0de6f5bd578d3d916476bb529efea895':
fix toc link
2013-08-01 15:22:28 -07:00
Scott Main
fca04b8731
am 3db57cf1: am c4c7463f: add note about VideoView "wrap_content" layout issue bug: 9364101
...
* commit '3db57cf19d59d1ed39d531137f6fd698befbb348':
add note about VideoView "wrap_content" layout issue bug: 9364101
2013-08-01 15:20:24 -07:00
Scott Main
3db57cf19d
am c4c7463f: add note about VideoView "wrap_content" layout issue bug: 9364101
...
* commit 'c4c7463f546ffb2eec7985c0a3d0203cbb8381bb':
add note about VideoView "wrap_content" layout issue bug: 9364101
2013-08-01 15:14:52 -07:00
Scott Main
f0e0cf4e0d
fix toc link
...
Change-Id: If2509e23db7f4f189f7521846598424cff2c2882
2013-08-01 15:13:06 -07:00
Scott Main
eb22128596
am fba14236: am 4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
...
* commit 'fba1423687f24063e87439b0ae26a12882bb4780':
new class on using action bar for training basics
2013-08-01 15:03:36 -07:00
Scott Main
c4c7463f54
add note about VideoView "wrap_content" layout issue
...
bug: 9364101
Change-Id: I21881b30f338e9cdd7ffaa509edcf71e9478ded5
2013-08-01 15:02:15 -07:00
Scott Main
fba1423687
am 4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
...
* commit '4633a50b6ddf630543e7778e00e084106e503c38':
new class on using action bar for training basics
2013-08-01 15:01:13 -07:00
Scott Main
4633a50b6d
Merge "new class on using action bar for training basics" into jb-mr2-docs
2013-08-01 21:58:57 +00:00
Scott Main
d041301adb
new class on using action bar for training basics
...
Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
2013-08-01 14:56:00 -07:00