35690 Commits

Author SHA1 Message Date
Scott Main
0f1259ccb7 am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
2013-03-05 13:03:25 -08:00
Jeff Sharkey
1e5e3748d4 am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
2013-03-01 17:26:07 -08:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes.
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
2013-03-01 17:20:51 -08:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes.
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-03-01 16:17:09 -08:00
Scott Main
87bff974d0 docs: clarify startActivity
Change-Id: I821321441bbb39b84031e9c65fe43762270e0148
2013-02-27 15:46:34 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
2013-02-07 17:18:48 -08:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
2013-02-07 16:42:26 -08:00
Adam Powell
07cf971e58 Fix re-enabled state of up after action view collapse
A certain call ordering to the action bar could cause the record of
the pre-action view expanded home button enabled state to be
incorrect. Store this in all cases, not just when the action view is
initially expanded. (Except for when we actually disable it for the
expanded view.)

If an action view is already expanded when we get a call to change the
enabled state of the home/up button, don't modify the state of the up
container or other accessibility info, but record the new state if
requested.

Bug 8142097

Change-Id: I070c151aa9f2046d2114ee541d964bf68c6f0def
2013-02-05 16:24:25 -08:00
Adam Powell
62f33030b9 Fix regression in expanded action view up
A bug was introduced when these views were restructured. Make sure that the
Up button for expanded action views functions/focuses correctly.

Bug 8124825

Change-Id: I0a886e62fca21dbb9a173db87642bb79ce9245e7
2013-02-04 12:47:34 -08:00
Xia Wang
2297d1e78c Merge "Fix WiFi test:" into jb-mr1.1-dev 2013-01-31 02:54:56 +00:00
Xia Wang
f2991add02 Fix WiFi test:
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
    Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
    to avoid that, change the test to connect without scanning.

 -- Increase the timer to wait for WiFi to be connected

Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
2013-01-30 18:52:27 -08:00
Fabrice Di Meglio
a62dbfd953 Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Change-Id: I19b7a53c1c7d805fb9b1611e8944db27c82fc986
2013-01-30 12:30:03 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today!
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
2013-01-23 14:23:06 -08:00
Scott Kennedy
026f91915f am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
  docs: Fix a bunch of issues
2013-01-14 11:09:27 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
2013-01-11 23:44:11 -08:00
Dianne Hackborn
e62fa82579 Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
The volume panel now forces us out of the UI modes while it
is up.

Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
2013-01-09 18:51:51 -08:00
Adam Powell
d29f2d263a Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev 2013-01-09 11:19:22 -08:00
Scott Main
25505f959c am cdf5106a: docs: a few doc bugs
* commit 'cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
  docs: a few doc bugs
2013-01-08 20:13:40 -08:00
Scott Main
cdf5106aaf docs: a few doc bugs
Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d
2013-01-08 20:07:31 -08:00
Adam Powell
4dca8636f8 Make action bar title a valid touch target for up when relevant
arubin bug 7966136

Change-Id: Iea5b85852cc1664f1390a6f8b6179d63b50857e4
2013-01-08 19:26:21 -08:00
Scott Main
66adf0d04d am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
* commit '70af3cdb90bafc081ffa693a350b95ced48b6cfd':
  docs: resolve bugs from external tracker
2013-01-08 12:42:10 -08:00
Scott Main
6aad995042 docs: resolve bugs from external tracker
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
2013-01-08 12:02:38 -08:00
Robert Ly
5042b051b3 am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
* commit 'e7c3fba7929a1cb73bbe6ca84a5140febc09a62a':
  change onEnd() to withEndAction() in javadocs
2012-12-17 15:35:26 -08:00
Robert Ly
8ee2a70f08 change onEnd() to withEndAction() in javadocs
Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
2012-12-17 15:00:08 -08:00
satok
6bad2f2fef Handle "CODE_ALREADY_PRESENT" message from Settings app
Bug: 7725834
Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
2012-12-17 15:02:04 +09:00
Baligh Uddin
435c03749a Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-14 11:57:45 -08:00
Baligh Uddin
0c2f090d23 Import translations. DO NOT MERGE
Change-Id: I4e8489952075f530451f167537a5f996380ae63d
Auto-generated-cl: translation import
2012-12-14 11:25:30 -08:00
Satoshi Kataoka
0e3849af47 Receive a user dictionary callback from Settings application
Bug: 7725834

The callback is sent when the user adds a word to the user dictionary.

Change-Id: Ieee9bfd50a9adbed1a769e3cd95d9cb2815c34b4
2012-12-14 17:21:43 +09:00
Baligh Uddin
90e41469fe Import translations. DO NOT MERGE
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
2012-12-12 11:14:26 -08:00
Jeff Brown
eaae7d976a Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 2012-12-11 14:14:54 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins.
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
2012-12-11 12:55:03 -08:00
Baligh Uddin
d39a0d8041 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-10 20:19:06 -08:00
Alex Yakavenka
32b424f724 Add config_speed_up_audio_on_mt_calls option
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
2012-12-10 15:47:35 -08:00
Baligh Uddin
ca4d4f7c90 Import translations. DO NOT MERGE
Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
2012-12-10 09:18:48 -08:00
Sascha Prueter
203f69f099 Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev 2012-12-07 12:36:09 -08:00
Baligh Uddin
ef489fe9ed Import translations. DO NOT MERGE
Change-Id: I4aaf67f3d31f73092284f9ebc09e7f619591cf5e
Auto-generated-cl: translation import
2012-12-07 11:50:46 -08:00
Craig Mautner
4abf3f987f Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
RecentsActivity screenshots are called for very quickly after
WindowStateAnimator prepareSurface(). Without enough delay the
Surface.setLayer call does not propagate to the SurfaceFlinger
and the screenshot is incorrect (black) because it stops sampling
the layers too early.

This fix calls Surface.setSize() for each sampled Surface in
screenshots. setSize forces the SurfaceFlinger to process all
transactions queued before returning from closeTransaction.

Bug 7552304 fixed.

Change-Id: I1911dfa0b09cab713c55f5ba0c612496337a77df

Conflicts:

	services/java/com/android/server/wm/WindowManagerService.java
2012-12-07 11:21:35 -08:00
Eric Laurent
2b89f73ef8 Enforce camera shutter sound for Korea.
Bug 7680515.

Change-Id: Iafd0296aac36bd048e409f42f7e99eb0895d3d26
2012-12-06 15:58:19 -08:00
Jake Hamby
91bb07718b Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev 2012-12-06 15:08:38 -08:00
Jake Hamby
37a2163267 Enable Turkish language encoding for Turkish SIM cards.
Enable Turkish language encoding for SMS messages. Adds an
MCC-specific config.xml override to enable the Turkish
language tables for Turkish SIM cards. Also modifies
GsmAlphabet.java to load the config.xml values before use,
so the SMSDispatcher will get the current values instead of
caching the boot-time values before the MCC is loaded.

Bug: 7422368
Change-Id: I57cd5fcc1d04a2d0cba3e8b9022078679cf5d4c1
2012-12-06 14:53:44 -08:00
Daniel Sandler
bc305e5544 Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev 2012-12-06 11:31:50 -08:00
Adam Cohen
29cfce7a38 Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev 2012-12-06 11:02:58 -08:00
Adam Cohen
ff06719077 Making sure to clear state related to views that are being recycled (issue 7650538)
Change-Id: I5161ac261f963789537d2066a472cd3036c218aa
2012-12-06 11:01:09 -08:00
Fabrice Di Meglio
b3b2922b10 Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev 2012-12-05 17:17:35 -08:00
Fabrice Di Meglio
0f3af41fbc Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 2012-12-05 15:17:35 -08:00
Jeff Sharkey
3757e234d7 Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 2012-12-05 14:54:00 -08:00
Craig Mautner
ddd75cb1ac Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev 2012-12-05 12:24:25 -08:00